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

3531 lines
79 KiB
C
Raw Normal View History

Revision 1.33: [7]download - view: [8]text, [9]markup, [10]annotated - [11]select for diffs Sat Feb 7 14:03:24 2009 UTC (6 weeks, 1 day ago) by kili Branches: [12]MAIN CVS tags: [13]OPENBSD_4_5_BASE, [14]OPENBSD_4_5, [15]HEAD Diff to: previous 1.32: [16]preferred, [17]coloured Changes since revision 1.32: +2 -2 lines Ensure that *wp isn't NULL. ok otto@
2009-03-22 18:53:50 +01:00
/* $OpenBSD: c_ksh.c,v 1.33 2009/02/07 14:03:24 kili Exp $ */
oksh merge
2010-04-09 20:59:30 +02:00
/* $OpenBSD: c_sh.c,v 1.41 2010/03/27 09:10:01 jmc Exp $ */
Revision 1.18: [7]download - view: [8]text, [9]markup, [10]annotated - [11]select for diffs Sun Mar 1 20:11:06 2009 UTC (2 weeks, 6 days ago) by otto Branches: [12]MAIN CVS tags: [13]HEAD Diff to: previous 1.17: [14]preferred, [15]coloured Changes since revision 1.17: +17 -9 lines Fix PR #[16]723: [17]test(1) operator precedence inconsistent with POSIX Make sure ksh builtin test and [18]test(1) do not differ. From Christiano Farina Haesbaert. ok miod@
2009-03-22 18:58:58 +01:00
/* $OpenBSD: c_test.c,v 1.18 2009/03/01 20:11:06 otto Exp $ */
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
/* $OpenBSD: c_ulimit.c,v 1.17 2008/03/21 12:51: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
• 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
/*-
Add “unset foo[*]” mksh extension, which allows to unset the *contents* of foo[0] (but not its attributes), and the rest of the array, so that later “set +A foo bar” will set foo[0]=bar but retain the attributes. This is important, because, in the future, arrays will have different attributes per element, instead of all the same (which, actually, is not entirely true right now either, since “unset foo[0]” will not mo- dify the attributes of a foo[1] existing at that point in time), where foo[$newkey] will inherit from foo[0], but typeset foo will only affect foo[0] no longer foo[*] in the future. (The rules about typeset=local will still apply, as they affect creation of variables in a scope.)
2010-01-25 15:11:29 +01:00
* Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
• 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
* Thorsten Glaser <tg@mirbsd.org>
*
* Provided that these terms and disclaimer and all copyright notices
* are retained or reproduced in an accompanying document, permission
* is granted to deal in this work without restriction, including un-
* limited rights to use, publicly perform, distribute, sell, modify,
* merge, give away, or sublicence.
*
* This work is provided "AS IS" and WITHOUT WARRANTY of any kind, to
* the utmost extent permitted by applicable law, neither express nor
* implied; without malicious intent or gross negligence. In no event
* may a licensor, author or contributor be held liable for indirect,
* direct, other damage, loss, or other issues arising in any way out
* of dealing in the work, even if advised of the possibility of such
* damage or existence of a defect, except proven that it results out
* of said person's immediate fault when using the work as intended.
*/
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
#include "sh.h"
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
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.164 2010/11/01 17:29:02 tg Exp $");
• Check if killpg(3) is available; if not, use kill(2) with negative process ID and hope it works (is POSIXly killpg-endowed) • bump version • sync clog
2009-06-08 22:34:40 +02:00
#if HAVE_KILLPG
/*
* use killpg if < -1 since -1 does special things
* for some non-killpg-endowed kills
*/
#define mksh_kill(p,s) ((p) < -1 ? killpg(-(p), (s)) : kill((p), (s)))
#else
/* cross fingers and hope kill is killpg-endowed */
#define mksh_kill kill
#endif
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
* 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 conditions correct? */
another duplicate defn avoidance
2009-07-25 22:35:22 +02:00
#if !defined(RLIM_INFINITY) && !defined(MKSH_NO_LIMITS)
Add MKSH_NO_LIMITS, to define which has the same effect as the absence of RLIM_INFINITY, namely make c_ulimit() into a true
2009-06-08 22:52:28 +02:00
#define MKSH_NO_LIMITS
#endif
Save another couple of bytes in the !ulimit case
2009-06-10 20:11:27 +02:00
#ifdef MKSH_NO_LIMITS
#define c_ulimit c_label
#endif
merge the nameref code, using mksh standard scoping as discussed
2009-09-06 19:42:15 +02:00
extern uint8_t set_refflag;
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
/* A leading = means assignments before command are kept;
* a leading * means a POSIX special builtin;
* a leading + means a POSIX regular builtin
* (* and + should not be combined).
*/
const struct builtin mkshbuiltins[] = {
{"*=.", c_dot},
{"*=:", c_label},
{"[", c_test},
{"*=break", c_brkcont},
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
{T_gbuiltin, c_builtin},
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
{"*=continue", c_brkcont},
{"*=eval", c_eval},
{"*=exec", c_exec},
{"*=exit", c_exitreturn},
{"+false", c_label},
{"*=return", c_exitreturn},
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
{T_sgset, c_set},
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
{"*=shift", c_shift},
{"=times", c_times},
{"*=trap", c_trap},
{"+=wait", c_wait},
{"+read", c_read},
{"test", c_test},
{"+true", c_label},
{"ulimit", c_ulimit},
{"+umask", c_umask},
{"*=unset", c_unset},
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
{T_palias, c_alias}, /* no =: AT&T manual wrong */
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
{"+cd", c_cd},
add the chdir builtin from mircvs://contrib/hosted/tg/deb/mksh/ for better dash compatibility (mksh is now a dash superset if printf is compiled in)
2009-08-30 23:02:01 +02:00
{"chdir", c_cd}, /* dash compatibility hack */
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
{"+command", c_command},
{"echo", c_print},
{"*=export", c_typeset},
{"+fc", c_fc},
{"+getopts", c_getopts},
{"+jobs", c_jobs},
{"+kill", c_kill},
{"let", c_let},
{"print", c_print},
"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
{"printf", c_printf},
#endif
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
{"pwd", c_pwd},
{"*=readonly", c_typeset},
further optimise and simplify the handling of $RANDOM, reads and writes to it are now either arc4random or rand/srand, but srand retains the old state; set +o arc4random is no longer possible, but if it's there we use arc4random(3), if not, we use rand(3) for $RANDOM reads; optimise special variable handling too and fix a few consts and other minor things
2009-09-26 05:40:03 +02:00
{T__typeset, c_typeset},
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
{T_punalias, c_unalias},
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
{"whence", c_whence},
fix jobless mksh so much to make it work on Minix 3
2009-04-05 14:35:32 +02:00
#ifndef MKSH_UNEMPLOYED
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
{"+bg", c_fgbg},
{"+fg", c_fgbg},
fix jobless mksh so much to make it work on Minix 3
2009-04-05 14:35:32 +02:00
#endif
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
{"bind", c_bind},
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
{"cat", c_cat},
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
{"mknod", c_mknod},
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
#endif
{"realpath", c_realpath},
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
{"rename", c_rename},
{NULL, (int (*)(const char **))NULL}
};
struct kill_info {
int num_width;
int name_width;
};
static const struct t_op {
tabs, bools
2009-04-07 21:51:47 +02:00
char op_text[4];
Test_op op_num;
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
} u_ops[] = {
{"-a", TO_FILAXST },
{"-b", TO_FILBDEV },
{"-c", TO_FILCDEV },
{"-d", TO_FILID },
{"-e", TO_FILEXST },
{"-f", TO_FILREG },
{"-G", TO_FILGID },
{"-g", TO_FILSETG },
{"-h", TO_FILSYM },
{"-H", TO_FILCDF },
{"-k", TO_FILSTCK },
{"-L", TO_FILSYM },
{"-n", TO_STNZE },
{"-O", TO_FILUID },
{"-o", TO_OPTION },
{"-p", TO_FILFIFO },
{"-r", TO_FILRD },
{"-s", TO_FILGZ },
{"-S", TO_FILSOCK },
{"-t", TO_FILTT },
{"-u", TO_FILSETU },
{"-w", TO_FILWR },
{"-x", TO_FILEX },
{"-z", TO_STZER },
{"", TO_NONOP }
};
static const struct t_op b_ops[] = {
{"=", TO_STEQL },
{"==", TO_STEQL },
{"!=", TO_STNEQ },
{"<", TO_STLT },
{">", TO_STGT },
{"-eq", TO_INTEQ },
{"-ne", TO_INTNE },
{"-gt", TO_INTGT },
{"-ge", TO_INTGE },
{"-lt", TO_INTLT },
{"-le", TO_INTLE },
{"-ef", TO_FILEQ },
{"-nt", TO_FILNT },
{"-ot", TO_FILOT },
{"", TO_NONOP }
};
static int test_eaccess(const char *, int);
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
static int test_oexpr(Test_env *, bool);
static int test_aexpr(Test_env *, bool);
static int test_nexpr(Test_env *, bool);
static int test_primary(Test_env *, bool);
• 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
static Test_op ptest_isa(Test_env *, Test_meta);
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
static const char *ptest_getopnd(Test_env *, Test_op, bool);
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
static void ptest_error(Test_env *, int, const char *);
make print_columns() aware that octets≠characters≠columns
2009-11-10 00:35:11 +01:00
static char *kill_fmt_entry(char *, int, int, const void *);
commit Syllable-related improvement: simplify p_time
2009-05-20 12:10:02 +02:00
static void p_time(struct shf *, bool, long, int, int,
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
const char *, const char *)
MKSH_A_NONNULL((nonnull (6, 7)));
add a do_realpath() implementation replacing the use of the external libc function realpath(3) which may not be available on the target system; compile the realpath builtin unconditionally looks fine to me, but review is appreciated; this is (very) lightly based upon MirBSD libc’s realpath(3) and pdksh’s get_phys_path()
2009-08-30 15:22:39 +02:00
static char *do_realpath(const char *);
static char *
do_realpath(const char *upath)
{
char *xp, *ip, *tp, *ipath, *ldest = NULL;
XString xs;
ptrdiff_t pos;
size_t len;
int symlinks = 32; /* max. recursion depth */
int llen;
struct stat sb;
address two performance issues in do_realpath(): • avoid calling realloc twice in sequence, since the final size is known at the first call already • do not lstat(2) the same path twice in the Hurd codepath
2010-04-27 23:39:09 +02:00
#ifdef NO_PATH_MAX
size_t ldestlen = 0;
#define pathlen sb.st_size
#define pathcnd (ldestlen < (pathlen + 1))
#else
#define pathlen PATH_MAX
#define pathcnd (!ldest)
#endif
add a do_realpath() implementation replacing the use of the external libc function realpath(3) which may not be available on the target system; compile the realpath builtin unconditionally looks fine to me, but review is appreciated; this is (very) lightly based upon MirBSD libc’s realpath(3) and pdksh’s get_phys_path()
2009-08-30 15:22:39 +02:00
if (upath[0] == '/') {
/* upath is an absolute pathname */
strdupx(ipath, upath, ATEMP);
} else {
/* upath is a relative pathname, prepend cwd */
if ((tp = ksh_get_wd(NULL)) == NULL || tp[0] != '/')
return (NULL);
shave off another 468 bytes: we’re 300 bytes smaller than BEFORE the cat builtin was added now… (also removed utf-8 from source files, in favour of just ASCII)
2010-08-28 22:22:24 +02:00
ipath = shf_smprintf("%s%s%s", tp, "/", upath);
add a do_realpath() implementation replacing the use of the external libc function realpath(3) which may not be available on the target system; compile the realpath builtin unconditionally looks fine to me, but review is appreciated; this is (very) lightly based upon MirBSD libc’s realpath(3) and pdksh’s get_phys_path()
2009-08-30 15:22:39 +02:00
afree(tp, ATEMP);
}
• 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
/* ipath and upath are in memory at the same time -> unchecked */
add a do_realpath() implementation replacing the use of the external libc function realpath(3) which may not be available on the target system; compile the realpath builtin unconditionally looks fine to me, but review is appreciated; this is (very) lightly based upon MirBSD libc’s realpath(3) and pdksh’s get_phys_path()
2009-08-30 15:22:39 +02:00
Xinit(xs, xp, strlen(ip = ipath) + 1, ATEMP);
while (*ip) {
/* skip slashes in input */
while (*ip == '/')
++ip;
if (!*ip)
break;
/* get next pathname component from input */
tp = ip;
while (*ip && *ip != '/')
++ip;
len = ip - tp;
/* check input for "." and ".." */
if (tp[0] == '.') {
if (len == 1)
/* just continue with the next one */
continue;
else if (len == 2 && tp[1] == '.') {
/* strip off last pathname component */
while (xp > Xstring(xs, xp))
if (*--xp == '/')
break;
/* then continue with the next one */
continue;
}
}
/* store output position away, then append slash to output */
pos = Xsavepos(xs, xp);
address two performance issues in do_realpath(): • avoid calling realloc twice in sequence, since the final size is known at the first call already • do not lstat(2) the same path twice in the Hurd codepath
2010-04-27 23:39:09 +02:00
/* 1 for the '/' and len + 1 for tp and the NUL from below */
XcheckN(xs, xp, 1 + len + 1);
add a do_realpath() implementation replacing the use of the external libc function realpath(3) which may not be available on the target system; compile the realpath builtin unconditionally looks fine to me, but review is appreciated; this is (very) lightly based upon MirBSD libc’s realpath(3) and pdksh’s get_phys_path()
2009-08-30 15:22:39 +02:00
Xput(xs, xp, '/');
/* append next pathname component to output */
memcpy(xp, tp, len);
xp += len;
*xp = '\0';
/* lstat the current output, see if it's a symlink */
if (lstat(Xstring(xs, xp), &sb)) {
/* lstat failed */
if (errno == ENOENT) {
/* because the pathname does not exist */
while (*ip == '/')
/* skip any trailing slashes */
++ip;
/* no more components left? */
if (!*ip)
/* we can still return successfully */
break;
/* more components left? fall through */
}
/* not ENOENT or not at the end of ipath */
goto notfound;
}
/* check if we encountered a symlink? */
if (S_ISLNK(sb.st_mode)) {
/* reached maximum recursion depth? */
if (!symlinks--) {
/* yep, prevent infinite loops */
errno = ELOOP;
goto notfound;
}
/* get symlink(7) target */
• 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
if (pathcnd) {
#ifdef NO_PATH_MAX
if (notoktoadd(pathlen, 1)) {
errno = ENAMETOOLONG;
goto notfound;
}
#endif
address two performance issues in do_realpath(): • avoid calling realloc twice in sequence, since the final size is known at the first call already • do not lstat(2) the same path twice in the Hurd codepath
2010-04-27 23:39:09 +02:00
ldest = aresize(ldest, pathlen + 1, ATEMP);
• 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
}
address two performance issues in do_realpath(): • avoid calling realloc twice in sequence, since the final size is known at the first call already • do not lstat(2) the same path twice in the Hurd codepath
2010-04-27 23:39:09 +02:00
llen = readlink(Xstring(xs, xp), ldest, pathlen);
if (llen < 0)
add a do_realpath() implementation replacing the use of the external libc function realpath(3) which may not be available on the target system; compile the realpath builtin unconditionally looks fine to me, but review is appreciated; this is (very) lightly based upon MirBSD libc’s realpath(3) and pdksh’s get_phys_path()
2009-08-30 15:22:39 +02:00
/* oops... */
goto notfound;
ldest[llen] = '\0';
/*
* restart if symlink target is an absolute path,
* otherwise continue with currently resolved prefix
*/
xp = (ldest[0] == '/') ? Xstring(xs, xp) :
Xrestpos(xs, xp, pos);
fix realpath builtin’s handling of (source) pathnames with a trailing slash as per POSIX (if a trailing slash is part of the symlink target it fails as well, like GNU readlink -f does)
2010-08-24 16:42:04 +02:00
tp = shf_smprintf("%s%s%s", ldest, *ip ? "/" : "", ip);
add a do_realpath() implementation replacing the use of the external libc function realpath(3) which may not be available on the target system; compile the realpath builtin unconditionally looks fine to me, but review is appreciated; this is (very) lightly based upon MirBSD libc’s realpath(3) and pdksh’s get_phys_path()
2009-08-30 15:22:39 +02:00
afree(ipath, ATEMP);
ip = ipath = tp;
}
/* otherwise (no symlink) merely go on */
}
/*
* either found the target and successfully resolved it,
* or found its parent directory and may create it
*/
if (Xlength(xs, xp) == 0)
/*
* if the resolved pathname is "", make it "/",
* otherwise do not add a trailing slash
*/
Xput(xs, xp, '/');
Xput(xs, xp, '\0');
fix realpath builtin’s handling of (source) pathnames with a trailing slash as per POSIX (if a trailing slash is part of the symlink target it fails as well, like GNU readlink -f does)
2010-08-24 16:42:04 +02:00
/*
* if source path had a trailing slash, check if target path
* is not a non-directory existing file
*/
if (ip > ipath && ip[-1] == '/') {
if (stat(Xstring(xs, xp), &sb)) {
if (errno != ENOENT)
goto notfound;
} else if (!S_ISDIR(sb.st_mode)) {
errno = ENOTDIR;
goto notfound;
}
/* target now either does not exist or is a directory */
}
/* return target path */
add a do_realpath() implementation replacing the use of the external libc function realpath(3) which may not be available on the target system; compile the realpath builtin unconditionally looks fine to me, but review is appreciated; this is (very) lightly based upon MirBSD libc’s realpath(3) and pdksh’s get_phys_path()
2009-08-30 15:22:39 +02:00
if (ldest != NULL)
afree(ldest, ATEMP);
afree(ipath, ATEMP);
return (Xclose(xs, xp));
notfound:
llen = errno; /* save; free(3) might trash it */
if (ldest != NULL)
afree(ldest, ATEMP);
afree(ipath, ATEMP);
Xfree(xs, xp);
errno = llen;
return (NULL);
address two performance issues in do_realpath(): • avoid calling realloc twice in sequence, since the final size is known at the first call already • do not lstat(2) the same path twice in the Hurd codepath
2010-04-27 23:39:09 +02:00
#undef pathlen
#undef pathcnd
add a do_realpath() implementation replacing the use of the external libc function realpath(3) which may not be available on the target system; compile the realpath builtin unconditionally looks fine to me, but review is appreciated; this is (very) lightly based upon MirBSD libc’s realpath(3) and pdksh’s get_phys_path()
2009-08-30 15:22:39 +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
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_cd(const 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
{
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int optc, rv, phys_path;
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
bool physical = Flag(FPHYSICAL) ? true : false;
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 cdnode; /* was a node from cdpath added in? */
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
bool printpath = false; /* print where we cd'd? */
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 *pwd_s, *oldpwd_s;
XString xs;
• 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
char *dir, *allocd = NULL, *tryp, *pwd, *cdpath;
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
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt, "LP")) != -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
switch (optc) {
case 'L':
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
physical = false;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 'P':
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
physical = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case '?':
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
wp += builtin_opt.optind;
if (Flag(FRESTRICTED)) {
bi_errorf("restricted shell - can't cd");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
pwd_s = global("PWD");
oldpwd_s = global("OLDPWD");
if (!wp[0]) {
/* No arguments - go home */
if ((dir = str_val(global("HOME"))) == null) {
bi_errorf("no home directory (HOME not set)");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
} else if (!wp[1]) {
/* One argument: - or dir */
• 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
strdupx(allocd, wp[0], ATEMP);
if (ksh_isdash((dir = allocd))) {
• alloc() can’t fail, afree() can take NULL ‣ macro afreechk() is superfluous • get rid of macro afreechv() by re-doing the “don’t leak that much” code • some KNF (mostly, whitespace and 80c) while here
2008-05-17 20:47:03 +02:00
afree(allocd, ATEMP);
allocd = NULL;
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
dir = str_val(oldpwd_s);
if (dir == null) {
bi_errorf("no OLDPWD");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
printpath = true;
• alloc() can’t fail, afree() can take NULL ‣ macro afreechk() is superfluous • get rid of macro afreechv() by re-doing the “don’t leak that much” code • some KNF (mostly, whitespace and 80c) while here
2008-05-17 20:47:03 +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
} else if (!wp[2]) {
/* Two arguments - substitute arg1 in PWD for arg2 */
• 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
size_t ilen, olen, nlen, elen;
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
char *cp;
if (!current_wd[0]) {
shave off another 468 bytes: we’re 300 bytes smaller than BEFORE the cat builtin was added now… (also removed utf-8 from source files, in favour of just ASCII)
2010-08-28 22:22:24 +02:00
bi_errorf("can't determine current directory");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
/* substitute arg1 for arg2 in current path.
* if the first substitution fails because the cd fails
* we could try to find another substitution. For now
* we don't
*/
if ((cp = strstr(current_wd, wp[0])) == NULL) {
bi_errorf("bad substitution");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
• 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
/*-
* ilen = part of current_wd before wp[0]
* elen = part of current_wd after wp[0]
* because current_wd and wp[1] need to be in memory at the
* same time beforehand the addition can stay unchecked
*/
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
ilen = cp - current_wd;
olen = strlen(wp[0]);
nlen = strlen(wp[1]);
elen = strlen(current_wd + ilen + olen) + 1;
* 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
dir = allocd = alloc(ilen + nlen + elen, 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
memcpy(dir, current_wd, ilen);
memcpy(dir + ilen, wp[1], nlen);
memcpy(dir + ilen + nlen, current_wd + ilen + olen, elen);
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
printpath = true;
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 {
bi_errorf("too many arguments");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
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
#ifdef NO_PATH_MAX
/* only a first guess; make_path will enlarge xs if necessary */
XinitN(xs, 1024, ATEMP);
#else
• 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
XinitN(xs, PATH_MAX, ATEMP);
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
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
cdpath = str_val(global("CDPATH"));
do {
cdnode = make_path(current_wd, dir, &cdpath, &xs, &phys_path);
if (physical)
• 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
rv = chdir(tryp = Xstring(xs, xp) + phys_path);
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 {
simplify_path(Xstring(xs, xp));
• 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
rv = chdir(tryp = Xstring(xs, xp));
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 more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
} while (rv < 0 && cdpath != NULL);
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 more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
if (rv < 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
if (cdnode)
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s: %s", dir, "bad 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
else
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s: %s", tryp, strerror(errno));
• alloc() can’t fail, afree() can take NULL ‣ macro afreechk() is superfluous • get rid of macro afreechv() by re-doing the “don’t leak that much” code • some KNF (mostly, whitespace and 80c) while here
2008-05-17 20:47:03 +02:00
afree(allocd, ATEMP);
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
replace pdksh’s get_phys_path() and do_phys_path() with my new do_realpath() function – looking fine, review welcome though
2009-08-30 15:30:08 +02:00
/* allocd (above) => dir, which is no longer used */
afree(allocd, ATEMP);
allocd = NULL;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
/* Clear out tracked aliases with relative paths */
flushcom(0);
/* Set OLDPWD (note: unsetting OLDPWD does not disable this
capitalise AT&T®
2009-06-11 14:42:21 +02:00
* setting in AT&T ksh)
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
*/
if (current_wd[0])
/* Ignore failure (happens if readonly or integer) */
setstr(oldpwd_s, current_wd, KSH_RETURN_ERROR);
if (Xstring(xs, xp)[0] != '/') {
pwd = NULL;
replace pdksh’s get_phys_path() and do_phys_path() with my new do_realpath() function – looking fine, review welcome though
2009-08-30 15:30:08 +02:00
} else if (!physical || !(pwd = allocd = do_realpath(Xstring(xs, xp))))
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
pwd = Xstring(xs, xp);
/* Set PWD */
if (pwd) {
char *ptmp = pwd;
replace pdksh’s get_phys_path() and do_phys_path() with my new do_realpath() function – looking fine, review welcome though
2009-08-30 15:30:08 +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
set_current_wd(ptmp);
/* Ignore failure (happens if readonly or integer) */
setstr(pwd_s, ptmp, KSH_RETURN_ERROR);
} else {
set_current_wd(null);
pwd = Xstring(xs, xp);
/* XXX unset $PWD? */
}
if (printpath || cdnode)
shprintf("%s\n", pwd);
• alloc() can’t fail, afree() can take NULL ‣ macro afreechk() is superfluous • get rid of macro afreechv() by re-doing the “don’t leak that much” code • some KNF (mostly, whitespace and 80c) while here
2008-05-17 20:47:03 +02:00
afree(allocd, ATEMP);
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
return (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
}
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_pwd(const 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
{
int optc;
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
bool physical = Flag(FPHYSICAL) ? true : false;
• alloc() can’t fail, afree() can take NULL ‣ macro afreechk() is superfluous • get rid of macro afreechv() by re-doing the “don’t leak that much” code • some KNF (mostly, whitespace and 80c) while here
2008-05-17 20:47:03 +02:00
char *p, *allocd = NULL;
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
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt, "LP")) != -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
switch (optc) {
case 'L':
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
physical = false;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 'P':
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
physical = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case '?':
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
wp += builtin_opt.optind;
if (wp[0]) {
bi_errorf("too many arguments");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
replace pdksh’s get_phys_path() and do_phys_path() with my new do_realpath() function – looking fine, review welcome though
2009-08-30 15:30:08 +02:00
p = current_wd[0] ? (physical ? allocd = do_realpath(current_wd) :
• alloc() can’t fail, afree() can take NULL ‣ macro afreechk() is superfluous • get rid of macro afreechv() by re-doing the “don’t leak that much” code • some KNF (mostly, whitespace and 80c) while here
2008-05-17 20:47:03 +02:00
current_wd) : NULL;
don't use setreuid(2) etc. stuff, like OpenBSD only affects suid shell scripts, which are *ugh* anyway, and I really have no idea what the old code did, when, why, etc. 262t 16d 2i
2006-11-10 07:16:25 +01:00
if (p && access(p, R_OK) < 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
p = NULL;
• alloc() can’t fail, afree() can take NULL ‣ macro afreechk() is superfluous • get rid of macro afreechv() by re-doing the “don’t leak that much” code • some KNF (mostly, whitespace and 80c) while here
2008-05-17 20:47:03 +02:00
if (!p && !(p = allocd = ksh_get_wd(NULL))) {
shave off another 468 bytes: we’re 300 bytes smaller than BEFORE the cat builtin was added now… (also removed utf-8 from source files, in favour of just ASCII)
2010-08-28 22:22:24 +02:00
bi_errorf("%s: %s", "can't determine current directory",
strerror(errno));
• alloc() can’t fail, afree() can take NULL ‣ macro afreechk() is superfluous • get rid of macro afreechv() by re-doing the “don’t leak that much” code • some KNF (mostly, whitespace and 80c) while here
2008-05-17 20:47:03 +02:00
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
shprintf("%s\n", p);
• alloc() can’t fail, afree() can take NULL ‣ macro afreechk() is superfluous • get rid of macro afreechv() by re-doing the “don’t leak that much” code • some KNF (mostly, whitespace and 80c) while here
2008-05-17 20:47:03 +02:00
afree(allocd, ATEMP);
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
return (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
}
$'…' 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
static const char *s_ptr;
static int s_get(void);
static void s_put(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
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_print(const 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
{
#define PO_NL BIT(0) /* print newline */
#define PO_EXPAND BIT(1) /* expand backslash sequences */
#define PO_PMINUSMINUS BIT(2) /* print a -- argument */
#define PO_HIST BIT(3) /* print to history instead of stdout */
#define PO_COPROC BIT(4) /* printing to coprocess: block SIGPIPE */
while testing haserl-0.9.26 on MirBSD, I discovered that the echo builtin in FSH mode did in fact, contrary to POSIX and Debian Policy 10.4 behavi- our (I think), interpret escape sequences; fix and add testsuite for echo
2009-10-10 23:17:31 +02:00
int fd = 1, 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
int flags = PO_EXPAND|PO_NL;
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
const char *s, *emsg;
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 xs;
char *xp;
while testing haserl-0.9.26 on MirBSD, I discovered that the echo builtin in FSH mode did in fact, contrary to POSIX and Debian Policy 10.4 behavi- our (I think), interpret escape sequences; fix and add testsuite for echo
2009-10-10 23:17:31 +02:00
if (wp[0][0] == 'e') {
/* echo builtin */
wp++;
To solve the incompatibility issues between mksh-current, old mksh versions and vendor pdksh versions, re-introduce FPOSIX alongside FSH. The semantics are now: ‣ set -o posix ⇒ • disable brace expansion and FSH when triggered • use Debian Policy 10.4 compliant non-XSI “echo” builtin • do not keep file descriptors > 2 to ksh ‣ set -o sh ⇒ • set automatically #ifdef MKSH_BINSHREDUCED • disable brace expansion and FPOSIX when triggered • use Debian Policy 10.4 compliant non-XSI “echo” builtin • do not keep file descriptors > 2 to ksh • trigger MKSH_MIDNIGHTBSD01ASH_COMPAT mode if compiled in • make “set -- $(getopt ab:c "$@")” construct work Note that the set/getopt one used to behave POSIXly only with FSH or FPOSIX (depending on the mksh version) set and Bourne-ish with it not set, so this changes default mksh behaviour to POSIX!
2010-01-28 16:18:51 +01:00
if (Flag(FPOSIX) || Flag(FSH)) {
while testing haserl-0.9.26 on MirBSD, I discovered that the echo builtin in FSH mode did in fact, contrary to POSIX and Debian Policy 10.4 behavi- our (I think), interpret escape sequences; fix and add testsuite for echo
2009-10-10 23:17:31 +02:00
/* Debian Policy 10.4 compliant "echo" builtin */
if (*wp && !strcmp(*wp, "-n")) {
/* we recognise "-n" only as the first arg */
flags = 0;
revision 1.32 date: 2009/02/07 07:24:37; author: guenther; state: Exp; lines: +24 -17 Make built-in echo behave according to POSIX when set -o posix is in effect: the only option is -n, and only one of those is parsed. diff from Ingo Schwarze ok otto@ kili@; manpage changes ok jmc@
2009-03-22 18:52:48 +01:00
wp++;
while testing haserl-0.9.26 on MirBSD, I discovered that the echo builtin in FSH mode did in fact, contrary to POSIX and Debian Policy 10.4 behavi- our (I think), interpret escape sequences; fix and add testsuite for echo
2009-10-10 23:17:31 +02:00
} else
/* otherwise, we print everything as-is */
flags = PO_NL;
} else {
int nflags = flags;
/**
* a compromise between sysV and BSD echo commands:
* escape sequences are enabled by default, and -n,
* -e and -E are recognised if they appear in argu-
* ments with no illegal options (ie, echo -nq will
* print -nq).
* Different from sysV echo since options are reco-
* gnised, different from BSD echo since escape se-
* quences are enabled by default.
*/
revision 1.32 date: 2009/02/07 07:24:37; author: guenther; state: Exp; lines: +24 -17 Make built-in echo behave according to POSIX when set -o posix is in effect: the only option is -n, and only one of those is parsed. diff from Ingo Schwarze ok otto@ kili@; manpage changes ok jmc@
2009-03-22 18:52:48 +01:00
while ((s = *wp) && *s == '-' && s[1]) {
while (*++s)
if (*s == 'n')
nflags &= ~PO_NL;
else if (*s == 'e')
nflags |= PO_EXPAND;
else if (*s == 'E')
nflags &= ~PO_EXPAND;
else
/*
* bad option: don't use
* nflags, print argument
*/
break;
while testing haserl-0.9.26 on MirBSD, I discovered that the echo builtin in FSH mode did in fact, contrary to POSIX and Debian Policy 10.4 behavi- our (I think), interpret escape sequences; fix and add testsuite for echo
2009-10-10 23:17:31 +02:00
revision 1.32 date: 2009/02/07 07:24:37; author: guenther; state: Exp; lines: +24 -17 Make built-in echo behave according to POSIX when set -o posix is in effect: the only option is -n, and only one of those is parsed. diff from Ingo Schwarze ok otto@ kili@; manpage changes ok jmc@
2009-03-22 18:52:48 +01:00
if (*s)
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
revision 1.32 date: 2009/02/07 07:24:37; author: guenther; state: Exp; lines: +24 -17 Make built-in echo behave according to POSIX when set -o posix is in effect: the only option is -n, and only one of those is parsed. diff from Ingo Schwarze ok otto@ kili@; manpage changes ok jmc@
2009-03-22 18:52:48 +01:00
wp++;
flags = nflags;
}
while testing haserl-0.9.26 on MirBSD, I discovered that the echo builtin in FSH mode did in fact, contrary to POSIX and Debian Policy 10.4 behavi- our (I think), interpret escape sequences; fix and add testsuite for echo
2009-10-10 23:17:31 +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
} else {
int optc;
const char *opts = "Rnprsu,";
while testing haserl-0.9.26 on MirBSD, I discovered that the echo builtin in FSH mode did in fact, contrary to POSIX and Debian Policy 10.4 behavi- our (I think), interpret escape sequences; fix and add testsuite for echo
2009-10-10 23:17:31 +02:00
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt, opts)) != -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
switch (optc) {
case 'R': /* fake BSD echo command */
flags |= PO_PMINUSMINUS;
flags &= ~PO_EXPAND;
opts = "ne";
break;
case 'e':
flags |= PO_EXPAND;
break;
case 'n':
flags &= ~PO_NL;
break;
case 'p':
if ((fd = coproc_getfd(W_OK, &emsg)) < 0) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s: %s", "-p", emsg);
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
break;
case 'r':
flags &= ~PO_EXPAND;
break;
case 's':
flags |= PO_HIST;
break;
case 'u':
if (!*(s = builtin_opt.optarg))
fd = 0;
else if ((fd = check_fd(s, W_OK, &emsg)) < 0) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s: %s: %s", "-u", s, emsg);
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
break;
case '?':
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
while testing haserl-0.9.26 on MirBSD, I discovered that the echo builtin in FSH mode did in fact, contrary to POSIX and Debian Policy 10.4 behavi- our (I think), interpret escape sequences; fix and add testsuite for echo
2009-10-10 23:17:31 +02:00
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (!(builtin_opt.info & GI_MINUSMINUS)) {
/* treat a lone - like -- */
if (wp[builtin_opt.optind] &&
• 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
ksh_isdash(wp[builtin_opt.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
builtin_opt.optind++;
} else if (flags & PO_PMINUSMINUS)
builtin_opt.optind--;
wp += builtin_opt.optind;
}
Xinit(xs, xp, 128, ATEMP);
while (*wp != NULL) {
s = *wp;
while ((c = *s++) != '\0') {
Xcheck(xs, xp);
if ((flags & PO_EXPAND) && c == '\\') {
$'…' 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
s_ptr = s;
c = unbksl(false, s_get, s_put);
s = s_ptr;
if (c == -1) {
new function unbksl doing "backslash expansion" independent of c_print(); also make a separate subsection about it in the manpage
2009-09-19 17:16:05 +02:00
/* rejected by generic function */
switch ((c = *s++)) {
case 'c':
flags &= ~PO_NL;
/* AT&T brain damage */
continue;
case '\0':
s--;
c = '\\';
break;
default:
Xput(xs, xp, '\\');
live code from FOSDEM: add print \xDB and \u20AC, including regression test agreed bsiegert@ good idea and manpage diff ok'd by some netbsd person sitting next to me
2008-02-24 16:48:43 +01:00
}
$'…' 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
} else if ((unsigned int)c > 0xFF) {
new function unbksl doing "backslash expansion" independent of c_print(); also make a separate subsection about it in the manpage
2009-09-19 17:16:05 +02:00
/* generic function returned Unicode */
char ts[4];
c = utf_wctomb(ts, c - 0x100);
ts[c] = 0;
for (c = 0; ts[c]; ++c)
Xput(xs, xp, ts[c]);
continue;
fix exit-eval-1 (Debian #550717), sync SUSv4 wording, improve comments
2009-10-15 18:36:27 +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
}
Xput(xs, xp, c);
}
if (*++wp != NULL)
Xput(xs, xp, ' ');
}
if (flags & PO_NL)
Xput(xs, xp, '\n');
if (flags & PO_HIST) {
Xput(xs, xp, '\0');
ignore more dups
2008-09-30 21:25:51 +02:00
histsave(&source->line, Xstring(xs, xp), true, false);
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
Xfree(xs, xp);
} else {
while testing haserl-0.9.26 on MirBSD, I discovered that the echo builtin in FSH mode did in fact, contrary to POSIX and Debian Policy 10.4 behavi- our (I think), interpret escape sequences; fix and add testsuite for echo
2009-10-10 23:17:31 +02:00
int len = Xlength(xs, xp);
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 opipe = 0;
/* Ensure we aren't killed by a SIGPIPE while writing to
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
* a coprocess. AT&T ksh doesn't seem to do this (seems
* update to mksh R26c * there is no comma in front of "which" in English, I was taught
2006-01-30 13:37:24 +01:00
* to just check that the co-process is alive which is
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
* not enough).
*/
if (coproc.write >= 0 && coproc.write == fd) {
flags |= PO_COPROC;
opipe = block_pipe();
}
for (s = Xstring(xs, xp); len > 0; ) {
while testing haserl-0.9.26 on MirBSD, I discovered that the echo builtin in FSH mode did in fact, contrary to POSIX and Debian Policy 10.4 behavi- our (I think), interpret escape sequences; fix and add testsuite for echo
2009-10-10 23:17:31 +02:00
if ((c = write(fd, s, len)) < 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
if (flags & PO_COPROC)
restore_pipe(opipe);
if (errno == EINTR) {
/* allow user to ^C out */
intrcheck();
if (flags & PO_COPROC)
opipe = block_pipe();
continue;
}
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
while testing haserl-0.9.26 on MirBSD, I discovered that the echo builtin in FSH mode did in fact, contrary to POSIX and Debian Policy 10.4 behavi- our (I think), interpret escape sequences; fix and add testsuite for echo
2009-10-10 23:17:31 +02:00
s += c;
len -= c;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
if (flags & PO_COPROC)
restore_pipe(opipe);
}
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
return (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
}
$'…' 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
static int
s_get(void)
{
return (*s_ptr++);
}
static void
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
s_put(int c MKSH_A_UNUSED)
$'…' 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
{
--s_ptr;
}
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
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_whence(const 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 tbl *tp;
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
const char *id;
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
bool pflag = false, vflag = false, Vflag = false;
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int rv = 0, optc, fcflags;
bool iam_whence = wp[0][0] == 'w';
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
const char *opts = iam_whence ? "pv" : "pvV";
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt, opts)) != -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
switch (optc) {
case 'p':
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
pflag = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 'v':
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
vflag = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 'V':
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
Vflag = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case '?':
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
wp += builtin_opt.optind;
fcflags = FC_BI | FC_PATH | FC_FUNC;
if (!iam_whence) {
/* Note that -p on its own is deal with in comexec() */
if (pflag)
fcflags |= FC_DEFPATH;
/* Convert command options to whence options - note that
* command -pV uses a different path search than whence -v
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
* or whence -pv. This should be considered a feature.
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
*/
vflag = Vflag;
}
if (pflag)
fcflags &= ~(FC_BI | FC_FUNC);
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
while ((vflag || rv == 0) && (id = *wp++) != 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
uint32_t h = 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
tp = NULL;
if ((iam_whence || vflag) && !pflag)
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
tp = ktsearch(&keywords, id, h = hash(id));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (!tp && !pflag) {
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
tp = ktsearch(&aliases, id, h ? h : hash(id));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (tp && !(tp->flag & ISSET))
tp = NULL;
}
if (!tp)
tp = findcom(id, fcflags);
if (vflag || (tp->type != CALIAS && tp->type != CEXEC &&
tp->type != CTALIAS))
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
shf_puts(id, shl_stdout);
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
if (vflag)
switch (tp->type) {
case CKEYWD:
case CALIAS:
case CFUNC:
case CSHELL:
shf_puts(" is a", shl_stdout);
break;
}
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
switch (tp->type) {
case CKEYWD:
if (vflag)
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shf_puts(" reserved word", shl_stdout);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case CALIAS:
if (vflag)
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("n %s%s for ",
(tp->flag & EXPORT) ? "exported " : null,
T_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
if (!iam_whence && !vflag)
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s %s=", T_alias, id);
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
print_value_quoted(tp->val.s);
break;
case CFUNC:
if (vflag) {
if (tp->flag & EXPORT)
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
shf_puts("n exported", shl_stdout);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (tp->flag & TRACE)
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
shf_puts(" traced", shl_stdout);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (!(tp->flag & ISSET)) {
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
shf_puts(" undefined", shl_stdout);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (tp->u.fpath)
shprintf(" (autoload from %s)",
tp->u.fpath);
}
shave off another 468 bytes: we’re 300 bytes smaller than BEFORE the cat builtin was added now… (also removed utf-8 from source files, in favour of just ASCII)
2010-08-28 22:22:24 +02:00
shf_puts(T__function, shl_stdout);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
break;
case CSHELL:
if (vflag)
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s %s %s",
(tp->flag & SPEC_BI) ? " special" : null,
"shell", T_builtin);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case CTALIAS:
case CEXEC:
if (tp->flag & ISSET) {
if (vflag) {
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
shf_puts(" is ", shl_stdout);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (tp->type == CTALIAS)
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("a tracked %s%s 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
(tp->flag & EXPORT) ?
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
"exported " : null,
T_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
}
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
shf_puts(tp->val.s, shl_stdout);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
} else {
if (vflag)
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf(" %s\n", "not found");
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
rv = 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
}
break;
default:
shprintf("%s is *GOK*", id);
break;
}
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
if (vflag || !rv)
• support IBM xlC on AIX • fix all bugs it could find ☺
2007-07-22 15:34:52 +02:00
shf_putc('\n', shl_stdout);
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 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
return (rv);
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
}
/* Deal with command -vV - command -p dealt with in comexec() */
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_command(const 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
{
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
/* Let c_whence do the work. Note that c_command() must be
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 distinct function from c_whence() (tested in comexec()).
*/
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
return (c_whence(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
}
/* typeset, export, and readonly */
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_typeset(const 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
{
Borland C++ found these
2007-07-01 23:10:29 +02:00
struct block *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
struct tbl *vp, **p;
reorganise c_typeset code, fixing that regression test also some int→bool while here
2008-04-01 23:39:45 +02:00
Tflag fset = 0, fclr = 0, flag;
int thing = 0, field, base, optc;
const char *opts;
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
const char *fieldstr, *basestr;
reorganise c_typeset code, fixing that regression test also some int→bool while here
2008-04-01 23:39:45 +02:00
bool localv = false, func = false, pflag = false, istset = true;
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
switch (**wp) {
case 'e': /* export */
fset |= EXPORT;
reorganise c_typeset code, fixing that regression test also some int→bool while here
2008-04-01 23:39:45 +02:00
istset = false;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 'r': /* readonly */
fset |= RDONLY;
reorganise c_typeset code, fixing that regression test also some int→bool while here
2008-04-01 23:39:45 +02:00
istset = false;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 's': /* set */
/* called with 'typeset -' */
break;
case 't': /* typeset */
reorganise c_typeset code, fixing that regression test also some int→bool while here
2008-04-01 23:39:45 +02:00
localv = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
}
reorganise c_typeset code, fixing that regression test also some int→bool while here
2008-04-01 23:39:45 +02:00
/* see comment below regarding possible opions */
merge the nameref code, using mksh standard scoping as discussed
2009-09-06 19:42:15 +02:00
opts = istset ? "L#R#UZ#afi#lnprtux" : "p";
reorganise c_typeset code, fixing that regression test also some int→bool while here
2008-04-01 23:39:45 +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
fieldstr = basestr = NULL;
builtin_opt.flags |= GF_PLUSOPT;
capitalise AT&T®
2009-06-11 14:42:21 +02:00
/* AT&T ksh seems to have 0-9 as options which are multiplied
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 get a number that is used with -L, -R, -Z or -i (eg, -1R2
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
* sets right justify in a field of 12). This allows options
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 be grouped in an order (eg, -Lu12), but disallows -i8 -L3 and
* does not allow the number to be specified as a separate argument
* Here, the number must follow the RLZi option, but is optional
* (see the # kludge in ksh_getopt()).
*/
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt, opts)) != -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
flag = 0;
switch (optc) {
case 'L':
flag = LJUST;
fieldstr = builtin_opt.optarg;
break;
case 'R':
flag = RJUST;
fieldstr = builtin_opt.optarg;
break;
case 'U':
capitalise AT&T®
2009-06-11 14:42:21 +02:00
/* AT&T ksh uses u, but this conflicts with
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
* upper/lower case. If this option is changed,
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
* need to change the -U below as well
*/
flag = INT_U;
break;
case 'Z':
flag = ZEROFIL;
fieldstr = builtin_opt.optarg;
break;
implement "typeset ±a" as no-op
2009-08-28 23:51:52 +02:00
case 'a':
/*
* this is supposed to set (-a) or unset (+a) the
* indexed array attribute; it does nothing on an
* existing regular string or indexed array though
*/
break;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case 'f':
reorganise c_typeset code, fixing that regression test also some int→bool while here
2008-04-01 23:39:45 +02:00
func = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 'i':
flag = INTEGER;
basestr = builtin_opt.optarg;
break;
case 'l':
flag = LCASEV;
break;
merge the nameref code, using mksh standard scoping as discussed
2009-09-06 19:42:15 +02:00
case 'n':
set_refflag = (builtin_opt.info & GI_PLUS) ? 2 : 1;
break;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case 'p':
reorganise c_typeset code, fixing that regression test also some int→bool while here
2008-04-01 23:39:45 +02:00
/* export, readonly: POSIX -p flag */
/* typeset: show values as well */
pflag = true;
if (istset)
continue;
break;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case 'r':
flag = RDONLY;
break;
case 't':
flag = TRACE;
break;
case 'u':
flag = UCASEV_AL; /* upper case / autoload */
break;
case 'x':
flag = EXPORT;
break;
case '?':
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
if (builtin_opt.info & GI_PLUS) {
fclr |= flag;
fset &= ~flag;
thing = '+';
} else {
fset |= flag;
fclr &= ~flag;
thing = '-';
}
}
field = 0;
if (fieldstr && !bi_getn(fieldstr, &field))
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
base = 0;
if (basestr && !bi_getn(basestr, &base))
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (!(builtin_opt.info & GI_MINUSMINUS) && wp[builtin_opt.optind] &&
(wp[builtin_opt.optind][0] == '-' ||
wp[builtin_opt.optind][0] == '+') &&
wp[builtin_opt.optind][1] == '\0') {
thing = wp[builtin_opt.optind][0];
builtin_opt.optind++;
}
merge the nameref code, using mksh standard scoping as discussed
2009-09-06 19:42:15 +02:00
if (func && (((fset|fclr) & ~(TRACE|UCASEV_AL|EXPORT)) || set_refflag)) {
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
bi_errorf("only -t, -u and -x options may be used with -f");
merge the nameref code, using mksh standard scoping as discussed
2009-09-06 19:42:15 +02:00
set_refflag = 0;
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
if (wp[builtin_opt.optind]) {
/* Take care of exclusions.
merge the nameref code, using mksh standard scoping as discussed
2009-09-06 19:42:15 +02:00
* At this point, flags in fset are cleared in fclr and vice
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
* versa. This property should be preserved.
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
*/
if (fset & LCASEV) /* LCASEV has priority over UCASEV_AL */
fset &= ~UCASEV_AL;
if (fset & LJUST) /* LJUST has priority over RJUST */
fset &= ~RJUST;
if ((fset & (ZEROFIL|LJUST)) == ZEROFIL) { /* -Z implies -ZR */
fset |= RJUST;
fclr &= ~RJUST;
}
/* Setting these attributes clears the others, unless they
* are also set in this command
*/
merge the nameref code, using mksh standard scoping as discussed
2009-09-06 19:42:15 +02:00
if ((fset & (LJUST | RJUST | ZEROFIL | UCASEV_AL | LCASEV |
INTEGER | INT_U | INT_L)) || set_refflag)
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
fclr |= ~fset & (LJUST | RJUST | ZEROFIL | UCASEV_AL |
LCASEV | INTEGER | INT_U | INT_L);
}
/* set variables and attributes */
if (wp[builtin_opt.optind]) {
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int i, rv = 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
struct tbl *f;
if (localv && !func)
fset |= LOCAL;
for (i = builtin_opt.optind; wp[i]; i++) {
if (func) {
f = findfunc(wp[i], hash(wp[i]),
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
(fset&UCASEV_AL) ? true : false);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (!f) {
capitalise AT&T®
2009-06-11 14:42:21 +02:00
/* AT&T ksh does ++rv: bogus */
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
rv = 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
continue;
}
if (fset | fclr) {
f->flag |= fset;
f->flag &= ~fclr;
shave off another 468 bytes: we’re 300 bytes smaller than BEFORE the cat builtin was added now… (also removed utf-8 from source files, in favour of just ASCII)
2010-08-28 22:22:24 +02:00
} else {
fpFUNCTf(shl_stdout, 0, f->flag & FKSH,
wp[i], f->val.t);
shf_putc('\n', shl_stdout);
}
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
} else if (!typeset(wp[i], fset, fclr, field, base)) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s: %s", wp[i], "not identifier");
merge the nameref code, using mksh standard scoping as discussed
2009-09-06 19:42:15 +02:00
set_refflag = 0;
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
}
merge the nameref code, using mksh standard scoping as discussed
2009-09-06 19:42:15 +02:00
set_refflag = 0;
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
return (rv);
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
}
/* list variables and attributes */
flag = fset | fclr; /* no difference at this point.. */
if (func) {
for (l = e->loc; l; l = l->next) {
sync with OpenBSD: remove unused code and vars; name clash with libc compiles under MirBSD
2006-01-29 21:04:54 +01:00
for (p = ktsort(&l->funs); (vp = *p++); ) {
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (flag && (vp->flag & flag) == 0)
continue;
if (thing == '-')
shave off another 468 bytes: we’re 300 bytes smaller than BEFORE the cat builtin was added now… (also removed utf-8 from source files, in favour of just ASCII)
2010-08-28 22:22:24 +02:00
fpFUNCTf(shl_stdout, 0,
vp->flag & FKSH,
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
vp->name, vp->val.t);
else
shave off another 468 bytes: we’re 300 bytes smaller than BEFORE the cat builtin was added now… (also removed utf-8 from source files, in favour of just ASCII)
2010-08-28 22:22:24 +02:00
shf_puts(vp->name, shl_stdout);
shf_putc('\n', shl_stdout);
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 {
for (l = e->loc; l; l = l->next) {
sync with OpenBSD: remove unused code and vars; name clash with libc compiles under MirBSD
2006-01-29 21:04:54 +01:00
for (p = ktsort(&l->vars); (vp = *p++); ) {
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 *tvp;
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
bool any_set = false;
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
/*
* See if the parameter is set (for arrays, if any
* element is set).
*/
for (tvp = vp; tvp; tvp = tvp->u.array)
if (tvp->flag & ISSET) {
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
any_set = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
}
/*
* Check attributes - note that all array elements
* have (should have?) the same attributes, so checking
* the first is sufficient.
*
* Report an unset param only if the user has
* explicitly given it some attribute (like export);
* otherwise, after "echo $FOO", we would report FOO...
*/
if (!any_set && !(vp->flag & USERATTRIB))
continue;
if (flag && (vp->flag & flag) == 0)
continue;
for (; vp; vp = vp->u.array) {
/* Ignore array elements that aren't
* set unless there are no set elements,
* in which case the first is reported on */
if ((vp->flag&ARRAY) && any_set &&
!(vp->flag & ISSET))
continue;
/* no arguments */
if (thing == 0 && flag == 0) {
capitalise AT&T®
2009-06-11 14:42:21 +02:00
/* AT&T ksh prints things
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
* like export, integer,
* leftadj, zerofill, etc.,
* but POSIX says must
* be suitable for re-entry...
*/
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
shf_puts("typeset ", shl_stdout);
merge the nameref code, using mksh standard scoping as discussed
2009-09-06 19:42:15 +02:00
if (((vp->flag&(ARRAY|ASSOC))==ASSOC))
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s ", "-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
if ((vp->flag&INTEGER))
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s ", "-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
if ((vp->flag&EXPORT))
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s ", "-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
if ((vp->flag&RDONLY))
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s ", "-r");
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if ((vp->flag&TRACE))
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s ", "-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
if ((vp->flag&LJUST))
shprintf("-L%d ", vp->u2.field);
if ((vp->flag&RJUST))
shprintf("-R%d ", vp->u2.field);
if ((vp->flag&ZEROFIL))
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s ", "-Z");
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if ((vp->flag&LCASEV))
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s ", "-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
if ((vp->flag&UCASEV_AL))
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s ", "-u");
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if ((vp->flag&INT_U))
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s ", "-U");
reorganise c_typeset code, fixing that regression test also some int→bool while here
2008-04-01 23:39:45 +02:00
shf_puts(vp->name, shl_stdout);
if (pflag) {
char *s = str_val(vp);
shf_putc('=', shl_stdout);
capitalise AT&T®
2009-06-11 14:42:21 +02:00
/* AT&T ksh can't have
reorganise c_typeset code, fixing that regression test also some int→bool while here
2008-04-01 23:39:45 +02:00
* justified integers.. */
if ((vp->flag &
(INTEGER|LJUST|RJUST)) ==
INTEGER)
shf_puts(s, shl_stdout);
else
print_value_quoted(s);
}
shf_putc('\n', shl_stdout);
if (vp->flag & ARRAY)
break;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
} else {
if (pflag)
reorganise c_typeset code, fixing that regression test also some int→bool while here
2008-04-01 23:39:45 +02:00
shf_puts(istset ?
"typeset " :
(flag & EXPORT) ?
"export " :
"readonly ",
shl_stdout);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if ((vp->flag&ARRAY) && any_set)
first step towards mksh R32 ☺ allow array indices in the uint32_t range (0‥4294967295) and map negatives into that range; adjust manual page and regression tests; to be used RSN ☻
2007-10-18 22:32:33 +02:00
shprintf("%s[%lu]",
vp->name,
merge the nameref code, using mksh standard scoping as discussed
2009-09-06 19:42:15 +02:00
arrayindex(vp));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
else
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
shf_puts(vp->name, shl_stdout);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (thing == '-' && (vp->flag&ISSET)) {
char *s = str_val(vp);
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
shf_putc('=', shl_stdout);
capitalise AT&T®
2009-06-11 14:42:21 +02:00
/* AT&T ksh can't have
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
* justified integers.. */
if ((vp->flag &
(INTEGER|LJUST|RJUST)) ==
INTEGER)
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
shf_puts(s, shl_stdout);
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
print_value_quoted(s);
}
• support IBM xlC on AIX • fix all bugs it could find ☺
2007-07-22 15:34:52 +02:00
shf_putc('\n', shl_stdout);
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
}
/* Only report first 'element' of an array with
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
* no set elements.
*/
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (!any_set)
break;
}
}
}
}
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
return (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
}
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_alias(const 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 table *t = &aliases;
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
int rv = 0, prefix = 0;
bool rflag = false, tflag, Uflag = false, pflag = false;
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
Tflag xflag = 0;
int optc;
builtin_opt.flags |= GF_PLUSOPT;
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt, "dprtUx")) != -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
prefix = builtin_opt.info & GI_PLUS ? '+' : '-';
switch (optc) {
case 'd':
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_NOPWNAM
t = NULL; /* fix "alias -dt" */
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
#else
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
t = &homedirs;
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
break;
case 'p':
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
pflag = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 'r':
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
rflag = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 't':
t = &taliases;
break;
case 'U':
/*
* kludge for tracked alias initialization
* (don't do a path search, just make an entry)
*/
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
Uflag = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 'x':
xflag = EXPORT;
break;
case '?':
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
}
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_NOPWNAM
if (t == NULL)
return (0);
#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
wp += builtin_opt.optind;
if (!(builtin_opt.info & GI_MINUSMINUS) && *wp &&
(wp[0][0] == '-' || wp[0][0] == '+') && wp[0][1] == '\0') {
prefix = wp[0][0];
wp++;
}
tflag = t == &taliases;
/* "hash -r" means reset all the tracked aliases.. */
if (rflag) {
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
static const char *args[] = {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
T_unalias, "-ta", NULL
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
};
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (!tflag || *wp) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s: -r flag can only be used with -t"
" and without arguments\n", T_alias);
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
ksh_getopt_reset(&builtin_opt, GF_ERROR);
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
return (c_unalias(args));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
if (*wp == NULL) {
struct tbl *ap, **p;
sync with OpenBSD: remove unused code and vars; name clash with libc compiles under MirBSD
2006-01-29 21:04:54 +01:00
for (p = ktsort(t); (ap = *p++) != NULL; )
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if ((ap->flag & (ISSET|xflag)) == (ISSET|xflag)) {
if (pflag)
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s ", T_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
shf_puts(ap->name, shl_stdout);
if (prefix != '+') {
shf_putc('=', shl_stdout);
print_value_quoted(ap->val.s);
}
• support IBM xlC on AIX • fix all bugs it could find ☺
2007-07-22 15:34:52 +02:00
shf_putc('\n', shl_stdout);
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 (; *wp != NULL; wp++) {
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
const char *alias = *wp, *val, *newval;
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
char *xalias = NULL;
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 *ap;
• use Jenkins’ one-at-a-time hash for mksh keytabs, as it has much better avalanche and no known funnels • improve comments • fix some types (uint32_t for hash, size_t for sizes) • optimise ktsort() no functional change, I think
2009-08-28 20:54:01 +02:00
uint32_t 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
• syn.c: replace expanded use of str_save() with the actual macro • others: fix 6 (!) cases of non-constant or side-effect arguments to the str_save() or str_nsave() macros, and other abuse of them • also fix some cosmetics and other un-nice code while here
2008-07-12 18:56:40 +02:00
if ((val = cstrchr(alias, '='))) {
• rewrite code to no longer use statements-as-expressions • optimise a little • Build.sh: remove HAVE_EXPSTMT test • Build.sh, */Makefile: sort tests, regenerate • mksh.hts: sync clog
2008-10-28 15:32:43 +01:00
strndupx(xalias, alias, val++ - alias, ATEMP);
alias = xalias;
• syn.c: replace expanded use of str_save() with the actual macro • others: fix 6 (!) cases of non-constant or side-effect arguments to the str_save() or str_nsave() macros, and other abuse of them • also fix some cosmetics and other un-nice code while here
2008-07-12 18:56:40 +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
h = hash(alias);
if (val == NULL && !tflag && !xflag) {
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
ap = ktsearch(t, alias, 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
if (ap != NULL && (ap->flag&ISSET)) {
if (pflag)
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s ", T_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
shf_puts(ap->name, shl_stdout);
if (prefix != '+') {
shf_putc('=', shl_stdout);
print_value_quoted(ap->val.s);
}
• support IBM xlC on AIX • fix all bugs it could find ☺
2007-07-22 15:34:52 +02:00
shf_putc('\n', shl_stdout);
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 {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
shprintf("%s %s %s\n", alias, T_alias,
"not found");
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
rv = 1;
}
continue;
}
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
ap = ktenter(t, alias, 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
ap->type = tflag ? CTALIAS : CALIAS;
/* Are we setting the value or just some flags? */
if ((val && !tflag) || (!val && tflag && !Uflag)) {
if (ap->flag&ALLOC) {
ap->flag &= ~(ALLOC|ISSET);
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
afree(ap->val.s, APERM);
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
}
capitalise AT&T®
2009-06-11 14:42:21 +02:00
/* ignore values for -t (AT&T ksh does this) */
• syn.c: replace expanded use of str_save() with the actual macro • others: fix 6 (!) cases of non-constant or side-effect arguments to the str_save() or str_nsave() macros, and other abuse of them • also fix some cosmetics and other un-nice code while here
2008-07-12 18:56:40 +02:00
newval = tflag ? search(alias, path, X_OK, NULL) : 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
if (newval) {
• 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
strdupx(ap->val.s, newval, APERM);
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
ap->flag |= ALLOC|ISSET;
} else
ap->flag &= ~ISSET;
}
ap->flag |= DEFINED;
if (prefix == '+')
ap->flag &= ~xflag;
else
ap->flag |= xflag;
• alloc() can’t fail, afree() can take NULL ‣ macro afreechk() is superfluous • get rid of macro afreechv() by re-doing the “don’t leak that much” code • some KNF (mostly, whitespace and 80c) while here
2008-05-17 20:47:03 +02:00
afree(xalias, 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
}
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
return (rv);
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
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_unalias(const 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 table *t = &aliases;
struct tbl *ap;
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
int optc, rv = 0;
bool all = false;
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
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt, "adt")) != -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
switch (optc) {
case 'a':
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
all = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 'd':
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_NOPWNAM
t = NULL; /* fix "unalias -dt" */
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
#else
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
t = &homedirs;
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
break;
case 't':
t = &taliases;
break;
case '?':
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
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_NOPWNAM
if (t == NULL)
return (0);
#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
wp += builtin_opt.optind;
for (; *wp != NULL; wp++) {
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
ap = ktsearch(t, *wp, hash(*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
if (ap == NULL) {
rv = 1; /* POSIX */
continue;
}
if (ap->flag&ALLOC) {
ap->flag &= ~(ALLOC|ISSET);
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
afree(ap->val.s, APERM);
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
}
ap->flag &= ~(DEFINED|ISSET|EXPORT);
}
if (all) {
struct tstate ts;
sync with OpenBSD: remove unused code and vars; name clash with libc compiles under MirBSD
2006-01-29 21:04:54 +01:00
for (ktwalk(&ts, t); (ap = ktnext(&ts)); ) {
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (ap->flag&ALLOC) {
ap->flag &= ~(ALLOC|ISSET);
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
afree(ap->val.s, APERM);
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
}
ap->flag &= ~(DEFINED|ISSET|EXPORT);
}
}
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
return (rv);
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
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_let(const 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
{
int rv = 1;
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
mksh_ari_t 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
capitalise AT&T®
2009-06-11 14:42:21 +02:00
if (wp[1] == NULL) /* AT&T ksh does this */
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
bi_errorf("no arguments");
else
for (wp++; *wp; wp++)
if (!evaluate(*wp, &val, KSH_RETURN_ERROR, true)) {
rv = 2; /* distinguish error from zero result */
break;
} else
rv = val == 0;
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
return (rv);
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
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_jobs(const 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
{
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
int optc, flag = 0, nflag = 0, rv = 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
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt, "lpnz")) != -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
switch (optc) {
case 'l':
flag = 1;
break;
case 'p':
flag = 2;
break;
case 'n':
nflag = 1;
break;
case 'z': /* debugging: print zombies */
nflag = -1;
break;
case '?':
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
wp += builtin_opt.optind;
if (!*wp) {
if (j_jobs(NULL, flag, nflag))
rv = 1;
} else {
for (; *wp; wp++)
if (j_jobs(*wp, flag, nflag))
rv = 1;
}
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
return (rv);
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
}
fix jobless mksh so much to make it work on Minix 3
2009-04-05 14:35:32 +02:00
#ifndef MKSH_UNEMPLOYED
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
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_fgbg(const 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
{
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
bool bg = strcmp(*wp, "bg") == 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
int rv = 0;
if (!Flag(FMONITOR)) {
bi_errorf("job control not enabled");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
if (ksh_getopt(wp, &builtin_opt, null) == '?')
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
wp += builtin_opt.optind;
if (*wp)
for (; *wp; wp++)
rv = j_resume(*wp, bg);
else
rv = j_resume("%%", bg);
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
return (bg ? 0 : rv);
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
}
fix jobless mksh so much to make it work on Minix 3
2009-04-05 14:35:32 +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
/* format a single kill item */
static char *
make print_columns() aware that octets≠characters≠columns
2009-11-10 00:35:11 +01:00
kill_fmt_entry(char *buf, int buflen, int i, const void *arg)
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 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 struct kill_info *ki = (const struct kill_info *)arg;
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
i++;
Clean up the signal mess, saves 172 Bytes: * 'sigseen' in Build.sh goes away * Signal name existence is checked in this order: have our own¹ -> sys_signame[] -> _sys_signame[] -> build our own² * Signal description existence is checked in this order: sys_siglist[] -> _sys_siglist[] -> strsignal() -> NULL³ ¹ Predefined list of items, for operating systems where we cannot build² them, i.e. Plan 9 and Minix 3 (e.g. no $CPP -dD) ² The usual cpp(1) stuff ³ Changed later, see below * Make $CPP test dependent on $NEED_MKSH_SIGNAME (others can be added here, this is not absolute) * Make signal name list generation² dependent on $NEED_MKSH_SIGNAME * Fix check if the generation worked * Guarantee that sigtraps[*].name and sigtraps[*].mess are valid C strings; this makes the code shorter *and* removes a few pos- sible nil pointer dereferences * Embed autoconf'd usages of sys_sig* / strsignal / mksh_sigpairs into inittraps() * Check for each signal 0<=i<=NSIG that name is not NULL or "" -> replace with ("%d", i) mess is not NULL or "" -> replace with ("Signal %d", i) name does not start (case-insensitive) with "SIG" -> name += 3 * In gettrap(), fix check if signal name starts, case-sensitive or case-insensitive, depending on need, with "SIG" (bug from millert@) Other changes: * Build.sh: ac_test[n]() are documented * Build.sh: ac_test[n]() can have negative prereqs as well now * Build.sh: use <<-'EOF' consistently * bump patchlevel to today
2007-01-12 01:25:40 +01:00
shf_snprintf(buf, buflen, "%*d %*s %s",
ki->num_width, i,
ki->name_width, sigtraps[i].name,
sigtraps[i].mess);
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
return (buf);
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
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_kill(const 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
{
Trap *t = NULL;
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
const char *p;
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
bool lflag = false;
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 i, n, rv, sig;
/* assume old style options if -digits or -UPPERCASE */
hand-sorted ctypes/chtypes upgrade; use table-driven where they make sense and preprocessored otherwise; unify the logic saves 144t 1i and lots of cpp(1) time, as well as improves readability
2006-11-10 08:52:04 +01:00
if ((p = wp[1]) && *p == '-' && (ksh_isdigit(p[1]) ||
ksh_isupper(p[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
if (!(t = gettrap(p + 1, true))) {
bi_errorf("bad signal '%s'", p + 1);
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
i = (wp[2] && strcmp(wp[2], "--") == 0) ? 3 : 2;
} else {
int optc;
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt, "ls:")) != -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
switch (optc) {
case 'l':
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
lflag = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 's':
if (!(t = gettrap(builtin_opt.optarg, true))) {
bi_errorf("bad signal '%s'",
builtin_opt.optarg);
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
break;
case '?':
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
i = builtin_opt.optind;
}
if ((lflag && t) || (!wp[i] && !lflag)) {
omit usage msg if small
2006-11-10 00:19:52 +01:00
#ifndef MKSH_SMALL
• more usage fixes, inspired by sobrado • bump mksh patchlevel
2008-06-08 19:15:30 +02:00
shf_puts("usage:\tkill [-s signame | -signum | -signame]"
" { job | pid | pgrp } ...\n"
"\tkill -l [exit_status ...]\n", shl_out);
omit usage msg if small
2006-11-10 00:19:52 +01:00
#endif
• we had an unused variable leftover • make warning-free for both gcc and xlC
2007-07-22 16:01:50 +02:00
bi_errorfz();
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
if (lflag) {
if (wp[i]) {
for (; wp[i]; i++) {
if (!bi_getn(wp[i], &n))
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (n > 128 && n < 128 + NSIG)
n -= 128;
Clean up the signal mess, saves 172 Bytes: * 'sigseen' in Build.sh goes away * Signal name existence is checked in this order: have our own¹ -> sys_signame[] -> _sys_signame[] -> build our own² * Signal description existence is checked in this order: sys_siglist[] -> _sys_siglist[] -> strsignal() -> NULL³ ¹ Predefined list of items, for operating systems where we cannot build² them, i.e. Plan 9 and Minix 3 (e.g. no $CPP -dD) ² The usual cpp(1) stuff ³ Changed later, see below * Make $CPP test dependent on $NEED_MKSH_SIGNAME (others can be added here, this is not absolute) * Make signal name list generation² dependent on $NEED_MKSH_SIGNAME * Fix check if the generation worked * Guarantee that sigtraps[*].name and sigtraps[*].mess are valid C strings; this makes the code shorter *and* removes a few pos- sible nil pointer dereferences * Embed autoconf'd usages of sys_sig* / strsignal / mksh_sigpairs into inittraps() * Check for each signal 0<=i<=NSIG that name is not NULL or "" -> replace with ("%d", i) mess is not NULL or "" -> replace with ("Signal %d", i) name does not start (case-insensitive) with "SIG" -> name += 3 * In gettrap(), fix check if signal name starts, case-sensitive or case-insensitive, depending on need, with "SIG" (bug from millert@) Other changes: * Build.sh: ac_test[n]() are documented * Build.sh: ac_test[n]() can have negative prereqs as well now * Build.sh: use <<-'EOF' consistently * bump patchlevel to today
2007-01-12 01:25:40 +01:00
if (n > 0 && n < NSIG)
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
shprintf("%s\n", sigtraps[n].name);
else
shprintf("%d\n", n);
}
} else {
make print_columns() aware that octets≠characters≠columns
2009-11-10 00:35:11 +01:00
int w, j, mess_cols, mess_octs;
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 kill_info ki;
for (j = NSIG, ki.num_width = 1; j >= 10; j /= 10)
ki.num_width++;
make print_columns() aware that octets≠characters≠columns
2009-11-10 00:35:11 +01:00
ki.name_width = mess_cols = mess_octs = 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
for (j = 0; j < NSIG; j++) {
Clean up the signal mess, saves 172 Bytes: * 'sigseen' in Build.sh goes away * Signal name existence is checked in this order: have our own¹ -> sys_signame[] -> _sys_signame[] -> build our own² * Signal description existence is checked in this order: sys_siglist[] -> _sys_siglist[] -> strsignal() -> NULL³ ¹ Predefined list of items, for operating systems where we cannot build² them, i.e. Plan 9 and Minix 3 (e.g. no $CPP -dD) ² The usual cpp(1) stuff ³ Changed later, see below * Make $CPP test dependent on $NEED_MKSH_SIGNAME (others can be added here, this is not absolute) * Make signal name list generation² dependent on $NEED_MKSH_SIGNAME * Fix check if the generation worked * Guarantee that sigtraps[*].name and sigtraps[*].mess are valid C strings; this makes the code shorter *and* removes a few pos- sible nil pointer dereferences * Embed autoconf'd usages of sys_sig* / strsignal / mksh_sigpairs into inittraps() * Check for each signal 0<=i<=NSIG that name is not NULL or "" -> replace with ("%d", i) mess is not NULL or "" -> replace with ("Signal %d", i) name does not start (case-insensitive) with "SIG" -> name += 3 * In gettrap(), fix check if signal name starts, case-sensitive or case-insensitive, depending on need, with "SIG" (bug from millert@) Other changes: * Build.sh: ac_test[n]() are documented * Build.sh: ac_test[n]() can have negative prereqs as well now * Build.sh: use <<-'EOF' consistently * bump patchlevel to today
2007-01-12 01:25:40 +01:00
w = strlen(sigtraps[j].name);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (w > ki.name_width)
ki.name_width = w;
w = strlen(sigtraps[j].mess);
make print_columns() aware that octets≠characters≠columns
2009-11-10 00:35:11 +01:00
if (w > mess_octs)
mess_octs = w;
/me is annoyed I read, IIRC in the Cederqvist, that 'cvs tag' sets a sticky tag onto the cwd… it doesn’t, apparently. (I actually like it better this way, but one needs to know!)
2009-11-28 15:28:03 +01:00
w = utf_mbswidth(sigtraps[j].mess);
make print_columns() aware that octets≠characters≠columns
2009-11-10 00:35:11 +01:00
if (w > mess_cols)
mess_cols = w;
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
}
print_columns(shl_stdout, NSIG - 1,
Clean up the signal mess, saves 172 Bytes: * 'sigseen' in Build.sh goes away * Signal name existence is checked in this order: have our own¹ -> sys_signame[] -> _sys_signame[] -> build our own² * Signal description existence is checked in this order: sys_siglist[] -> _sys_siglist[] -> strsignal() -> NULL³ ¹ Predefined list of items, for operating systems where we cannot build² them, i.e. Plan 9 and Minix 3 (e.g. no $CPP -dD) ² The usual cpp(1) stuff ³ Changed later, see below * Make $CPP test dependent on $NEED_MKSH_SIGNAME (others can be added here, this is not absolute) * Make signal name list generation² dependent on $NEED_MKSH_SIGNAME * Fix check if the generation worked * Guarantee that sigtraps[*].name and sigtraps[*].mess are valid C strings; this makes the code shorter *and* removes a few pos- sible nil pointer dereferences * Embed autoconf'd usages of sys_sig* / strsignal / mksh_sigpairs into inittraps() * Check for each signal 0<=i<=NSIG that name is not NULL or "" -> replace with ("%d", i) mess is not NULL or "" -> replace with ("Signal %d", i) name does not start (case-insensitive) with "SIG" -> name += 3 * In gettrap(), fix check if signal name starts, case-sensitive or case-insensitive, depending on need, with "SIG" (bug from millert@) Other changes: * Build.sh: ac_test[n]() are documented * Build.sh: ac_test[n]() can have negative prereqs as well now * Build.sh: use <<-'EOF' consistently * bump patchlevel to today
2007-01-12 01:25:40 +01:00
kill_fmt_entry, (void *)&ki,
make print_columns() aware that octets≠characters≠columns
2009-11-10 00:35:11 +01:00
ki.num_width + 1 + ki.name_width + 1 + mess_octs,
ki.num_width + 1 + ki.name_width + 1 + mess_cols,
true);
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 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
return (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
}
rv = 0;
sig = t ? t->signal : SIGTERM;
for (; (p = wp[i]); i++) {
if (*p == '%') {
if (j_kill(p, sig))
rv = 1;
} else if (!getn(p, &n)) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s: %s", p,
"arguments must be jobs or process IDs");
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
rv = 1;
} else {
• Check if killpg(3) is available; if not, use kill(2) with negative process ID and hope it works (is POSIXly killpg-endowed) • bump version • sync clog
2009-06-08 22:34:40 +02:00
if (mksh_kill(n, sig) < 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
bi_errorf("%s: %s", p, strerror(errno));
rv = 1;
}
}
}
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
return (rv);
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
}
void
getopts_reset(int val)
{
if (val >= 1) {
get rid of special "POSIX"ish mode
2005-07-04 14:27:28 +02:00
ksh_getopt_reset(&user_opt, GF_NONAME | GF_PLUSOPT);
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
user_opt.optind = user_opt.uoptind = val;
}
}
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_getopts(const 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
{
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int argc, optc, rv;
const char *opts, *var;
char buf[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
struct tbl *vq, *voptarg;
if (ksh_getopt(wp, &builtin_opt, null) == '?')
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
wp += builtin_opt.optind;
opts = *wp++;
if (!opts) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("missing %s argument", "options");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
var = *wp++;
if (!var) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("missing %s argument", "name");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
if (!*var || *skip_varname(var, true)) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s: %s", var, "is not an identifier");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
if (e->loc->next == NULL) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
internal_warningf("%s: %s", "c_getopts", "no argv");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
/* Which arguments are we parsing... */
if (*wp == NULL)
wp = e->loc->next->argv;
else
*--wp = e->loc->next->argv[0];
/* Check that our saved state won't cause a core dump... */
for (argc = 0; wp[argc]; argc++)
;
if (user_opt.optind > argc ||
(user_opt.p != 0 &&
user_opt.p > strlen(wp[user_opt.optind - 1]))) {
bi_errorf("arguments changed since last call");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
user_opt.optarg = NULL;
optc = ksh_getopt(wp, &user_opt, opts);
if (optc >= 0 && optc != '?' && (user_opt.info & GI_PLUS)) {
buf[0] = '+';
buf[1] = optc;
buf[2] = '\0';
} else {
capitalise AT&T®
2009-06-11 14:42:21 +02:00
/* POSIX says var is set to ? at end-of-options, AT&T ksh
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
* sets it to null - we go with POSIX...
*/
buf[0] = optc < 0 ? '?' : optc;
buf[1] = '\0';
}
fix utilities-getopts-1 and utilities-getopts-2
2009-10-15 18:32:50 +02:00
/* AT&T ksh93 in fact does change OPTIND for unknown options too */
user_opt.uoptind = user_opt.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
voptarg = global("OPTARG");
capitalise AT&T®
2009-06-11 14:42:21 +02:00
voptarg->flag &= ~RDONLY; /* AT&T ksh clears ro and 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
/* Paranoia: ensure no bizarre results. */
if (voptarg->flag & INTEGER)
typeset("OPTARG", 0, INTEGER, 0, 0);
if (user_opt.optarg == NULL)
Add “unset foo[*]” mksh extension, which allows to unset the *contents* of foo[0] (but not its attributes), and the rest of the array, so that later “set +A foo bar” will set foo[0]=bar but retain the attributes. This is important, because, in the future, arrays will have different attributes per element, instead of all the same (which, actually, is not entirely true right now either, since “unset foo[0]” will not mo- dify the attributes of a foo[1] existing at that point in time), where foo[$newkey] will inherit from foo[0], but typeset foo will only affect foo[0] no longer foo[*] in the future. (The rules about typeset=local will still apply, as they affect creation of variables in a scope.)
2010-01-25 15:11:29 +01:00
unset(voptarg, 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
else
/* This can't fail (have cleared readonly/integer) */
setstr(voptarg, user_opt.optarg, KSH_RETURN_ERROR);
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
rv = 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
vq = global(var);
/* Error message already printed (integer, readonly) */
if (!setstr(vq, buf, KSH_RETURN_ERROR))
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
rv = 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
if (Flag(FEXPORT))
typeset(var, EXPORT, 0, 0, 0);
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
return (optc < 0 ? 1 : rv);
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
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_bind(const 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
{
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
int optc, rv = 0;
* shrink MKSH_SMALL even further by removing functionality like some GNU bash extensions (suggested by cnuke@) and bind macros * make the random cache more efficient (and the code potentially smaller, although we have a new implementation of the oaat hash function, alongside the old one, now) and pushb only if needed (i.e. state has changed or user has set $RANDOM, but not onfork)
2009-09-23 20:04:58 +02:00
#ifndef MKSH_SMALL
bool macro = false;
#endif
bool list = false;
• 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 *cp;
char *up;
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
* shrink MKSH_SMALL even further by removing functionality like some GNU bash extensions (suggested by cnuke@) and bind macros * make the random cache more efficient (and the code potentially smaller, although we have a new implementation of the oaat hash function, alongside the old one, now) and pushb only if needed (i.e. state has changed or user has set $RANDOM, but not onfork)
2009-09-23 20:04:58 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt,
#ifndef MKSH_SMALL
"lm"
#else
"l"
#endif
)) != -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
switch (optc) {
case 'l':
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
list = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
* shrink MKSH_SMALL even further by removing functionality like some GNU bash extensions (suggested by cnuke@) and bind macros * make the random cache more efficient (and the code potentially smaller, although we have a new implementation of the oaat hash function, alongside the old one, now) and pushb only if needed (i.e. state has changed or user has set $RANDOM, but not onfork)
2009-09-23 20:04:58 +02:00
#ifndef MKSH_SMALL
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case 'm':
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
macro = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
* shrink MKSH_SMALL even further by removing functionality like some GNU bash extensions (suggested by cnuke@) and bind macros * make the random cache more efficient (and the code potentially smaller, although we have a new implementation of the oaat hash function, alongside the old one, now) and pushb only if needed (i.e. state has changed or user has set $RANDOM, but not onfork)
2009-09-23 20:04:58 +02:00
#endif
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case '?':
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
wp += builtin_opt.optind;
if (*wp == NULL) /* list all */
* shrink MKSH_SMALL even further by removing functionality like some GNU bash extensions (suggested by cnuke@) and bind macros * make the random cache more efficient (and the code potentially smaller, although we have a new implementation of the oaat hash function, alongside the old one, now) and pushb only if needed (i.e. state has changed or user has set $RANDOM, but not onfork)
2009-09-23 20:04:58 +02:00
rv = x_bind(NULL, NULL,
#ifndef MKSH_SMALL
false,
#endif
list);
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 (; *wp != NULL; wp++) {
• 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
if ((cp = cstrchr(*wp, '=')) == NULL)
up = NULL;
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
strdupx(up, *wp, ATEMP);
• 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
up[cp++ - *wp] = '\0';
}
* shrink MKSH_SMALL even further by removing functionality like some GNU bash extensions (suggested by cnuke@) and bind macros * make the random cache more efficient (and the code potentially smaller, although we have a new implementation of the oaat hash function, alongside the old one, now) and pushb only if needed (i.e. state has changed or user has set $RANDOM, but not onfork)
2009-09-23 20:04:58 +02:00
if (x_bind(up ? up : *wp, cp,
#ifndef MKSH_SMALL
macro,
#endif
false))
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
rv = 1;
• alloc() can’t fail, afree() can take NULL ‣ macro afreechk() is superfluous • get rid of macro afreechv() by re-doing the “don’t leak that much” code • some KNF (mostly, whitespace and 80c) while here
2008-05-17 20:47:03 +02:00
afree(up, 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
}
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
return (rv);
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
}
Save another couple of bytes in the !ulimit case
2009-06-10 20:11:27 +02:00
/* :, false and true (and ulimit if MKSH_NO_LIMITS) */
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
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_label(const 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
{
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
return (wp[0][0] == 'f' ? 1 : 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
}
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_shift(const 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 block *l = e->loc;
int n;
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
mksh_ari_t val;
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
const char *arg;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (ksh_getopt(wp, &builtin_opt, null) == '?')
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
arg = wp[builtin_opt.optind];
if (arg) {
evaluate(arg, &val, KSH_UNWIND_ERROR, false);
n = val;
} else
n = 1;
if (n < 0) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s: %s", arg, "bad number");
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
return (1);
}
if (l->argc < n) {
bi_errorf("nothing to shift");
return (1);
}
l->argv[n] = l->argv[0];
l->argv += n;
l->argc -= n;
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
return (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
}
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_umask(const 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
{
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int i, optc;
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
const char *cp;
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
bool symbolic = false;
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
mode_t old_umask;
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt, "S")) != -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
switch (optc) {
case 'S':
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
symbolic = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case '?':
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
cp = wp[builtin_opt.optind];
if (cp == NULL) {
While mksh R39 builds fine on MirOS #7s8E on my trusty sparc, pgcc 2.95.3 throws out quite some warnings – fix most of them except most emitted via -Wconversion; work around some others; discard bogus warnings. sync clog
2009-08-08 15:08:53 +02:00
old_umask = umask((mode_t)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
umask(old_umask);
if (symbolic) {
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
char buf[18], *p;
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 j;
old_umask = ~old_umask;
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
p = buf;
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 (i = 0; i < 3; i++) {
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
*p++ = "ugo"[i];
*p++ = '=';
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 (j = 0; j < 3; j++)
if (old_umask & (1 << (8 - (3*i + j))))
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
*p++ = "rwx"[j];
*p++ = ',';
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 const branch +- a few
2007-03-04 01:13:17 +01:00
p[-1] = '\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
shprintf("%s\n", buf);
} else
• more unsigned → unsigned int • more int → bool • more regression tests: check if the utf8-hack flag is really disabled at non-interactive startup, enabled at interactive startup, if the current locale is a UTF-8 one • make the mksh-local multibyte handling functions globally accessible, change their names, syntax and semantics a little (XXX more work needed) • optimise • utf_wctomb: src → dst, as we’re writing to that char array (pasto?) • edit.c:x_e_getmbc(): if the second byte of a 2- or 3-byte multibyte sequence is invalid utf-8, ungetc it (not possible for the 3rd byte yet) • edit.c:x_zotc3(): easier (and faster) handling of UTF-8 • implement, document and test for base-1 numbers: they just get the ASCII (8-bit) or Unicode (UTF-8) value of the octet(s) after the ‘1#’, or do the same as print \x## or \u#### (depending on the utf8-hack flag), plus support the PUA assignment of EF80‥EFFF for the MirBSD encoding “hack” (print doesn’t, as it has \x## and \u#### to distinguish, but we cannot use base-0 numbers which I had planned to use for raw octets first, as they are used internally): http://thread.gmane.org/gmane.os.miros.general/7938 • as an application example, add a hexdumper to the regression tests ☺
2008-04-20 00:15:06 +02:00
shprintf("%#3.3o\n", (unsigned int)old_umask);
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 {
mode_t new_umask;
hand-sorted ctypes/chtypes upgrade; use table-driven where they make sense and preprocessored otherwise; unify the logic saves 144t 1i and lots of cpp(1) time, as well as improves readability
2006-11-10 08:52:04 +01:00
if (ksh_isdigit(*cp)) {
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 (new_umask = 0; *cp >= '0' && *cp <= '7'; cp++)
new_umask = new_umask * 8 + (*cp - '0');
if (*cp) {
bi_errorf("bad number");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
} else {
/* symbolic format */
int positions, new_val;
char op;
While mksh R39 builds fine on MirOS #7s8E on my trusty sparc, pgcc 2.95.3 throws out quite some warnings – fix most of them except most emitted via -Wconversion; work around some others; discard bogus warnings. sync clog
2009-08-08 15:08:53 +02:00
old_umask = umask((mode_t)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
umask(old_umask); /* in case of error */
old_umask = ~old_umask;
new_umask = old_umask;
positions = 0;
while (*cp) {
• 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
while (*cp && vstrchr("augo", *cp))
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
switch (*cp++) {
case 'a':
positions |= 0111;
break;
case 'u':
positions |= 0100;
break;
case 'g':
positions |= 0010;
break;
case 'o':
positions |= 0001;
break;
}
if (!positions)
positions = 0111; /* default is a */
• 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
if (!vstrchr("=+-", op = *cp))
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
cp++;
new_val = 0;
• remove strcasestr.c, use home-grown implementation¹, call it stricmp, and have it return an API-correct const char * • enhance and stylify comments • a little KNF and simplifications • #ifdef DEBUG: replace strchr and strstr with ucstrchr and ucstrstr that take and return a non-const char *, and fix the violations • new cstrchr, cstrstr (take and give const char *) • new vstrchr, vstrstr (take const or not, give boolean value) • new afreechk(x) = afreechv(x,x) = if (x1) afree(x2, ATEMP) • new ksh_isdash(str) = (str != NULL) && !strcmp(str, "-") • replace the only use of strrchr with inlined code to shrink • minor man page fixes • Minix 3 signames are autogenerated with gcc • rename strlfun.c to strlcpy.c since we don't do strlcat(3) anyway, only strlcpy(3), and shorten it • dot.mkshrc: move MKSH=… down to the export line to not disturb the PS1 visual impression ☺ • dot.mkshrc: Lstripcom(): optimise • bump version ¹) side effect from creating API-correct cstrchr, cstrstr, etc. uses goto so it must be better ☻ tested on mirbsd-current via both Makefile and Build.sh
2007-03-04 04:04:28 +01:00
while (*cp && vstrchr("rwxugoXs", *cp))
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
switch (*cp++) {
case 'r': new_val |= 04; break;
case 'w': new_val |= 02; break;
case 'x': new_val |= 01; break;
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
case 'u':
new_val |= old_umask >> 6;
break;
case 'g':
new_val |= old_umask >> 3;
break;
case 'o':
new_val |= old_umask >> 0;
break;
case 'X':
if (old_umask & 0111)
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_val |= 01;
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
break;
case 's':
/* ignored */
break;
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_val = (new_val & 07) * positions;
switch (op) {
case '-':
new_umask &= ~new_val;
break;
case '=':
new_umask = new_val |
(new_umask & ~(positions * 07));
break;
case '+':
new_umask |= new_val;
}
if (*cp == ',') {
positions = 0;
cp++;
• 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
} else if (!vstrchr("=+-", *cp))
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
}
if (*cp) {
bi_errorf("bad mask");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
new_umask = ~new_umask;
}
umask(new_umask);
}
another one from debian: '.' needs an argument
2008-02-24 16:57:20 +01:00
return (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
}
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_dot(const 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
{
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
const char *file, *cp, **argv;
int argc, i, errcode;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (ksh_getopt(wp, &builtin_opt, null) == '?')
another one from debian: '.' needs an argument
2008-02-24 16:57:20 +01:00
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
another one from debian: '.' needs an argument
2008-02-24 16:57:20 +01:00
if ((cp = wp[builtin_opt.optind]) == NULL) {
bi_errorf("missing argument");
return (1);
}
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
if ((file = search(cp, path, R_OK, &errcode)) == NULL) {
bi_errorf("%s: %s", cp,
errcode ? strerror(errcode) : "not found");
another one from debian: '.' needs an argument
2008-02-24 16:57:20 +01:00
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
/* Set positional parameters? */
if (wp[builtin_opt.optind + 1]) {
argv = wp + builtin_opt.optind;
argv[0] = e->loc->argv[0]; /* preserve $0 */
for (argc = 0; argv[argc + 1]; argc++)
;
} else {
argc = 0;
argv = NULL;
}
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
if ((i = include(file, argc, argv, 0)) < 0) {
/* should not happen */
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
bi_errorf("%s: %s", cp, strerror(errno));
another one from debian: '.' needs an argument
2008-02-24 16:57:20 +01:00
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
another one from debian: '.' needs an argument
2008-02-24 16:57:20 +01:00
return (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
}
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_wait(const 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
{
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int rv = 0, sig;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (ksh_getopt(wp, &builtin_opt, null) == '?')
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
wp += builtin_opt.optind;
if (*wp == NULL) {
while (waitfor(NULL, &sig) >= 0)
;
rv = sig;
} else {
for (; *wp; wp++)
rv = waitfor(*wp, &sig);
if (rv < 0)
rv = sig ? sig : 127; /* magic exit code: bad job-id */
}
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
return (rv);
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
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_read(const 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
{
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int c = 0, ecode = 0, fd = 0, optc;
bool expande = true, historyr = false, expanding;
const char *cp, *emsg;
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 shf *shf;
fix uber-pedantic Apple GCC 4
2005-09-12 21:28:18 +02:00
XString cs, xs = { NULL, NULL, 0, NULL};
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
struct tbl *vp;
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
char *ccp, *xp = NULL, *wpalloc = NULL;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
static char REPLY[] = "REPLY";
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt, "prsu,")) != -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
switch (optc) {
case 'p':
if ((fd = coproc_getfd(R_OK, &emsg)) < 0) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s: %s", "-p", emsg);
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
break;
case 'r':
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
expande = false;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 's':
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
historyr = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 'u':
if (!*(cp = builtin_opt.optarg))
fd = 0;
else if ((fd = check_fd(cp, R_OK, &emsg)) < 0) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s: %s: %s", "-u", cp, emsg);
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
break;
case '?':
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
wp += builtin_opt.optind;
if (*wp == NULL)
*--wp = REPLY;
/* Since we can't necessarily seek backwards on non-regular files,
* don't buffer them so we can't read too much.
*/
shf = shf_reopen(fd, SHF_RD | SHF_INTERRUPT | can_seek(fd), shl_spare);
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
if ((cp = cstrchr(*wp, '?')) != NULL) {
• 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
strdupx(wpalloc, *wp, ATEMP);
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
wpalloc[cp - *wp] = '\0';
*wp = wpalloc;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (isatty(fd)) {
capitalise AT&T®
2009-06-11 14:42:21 +02:00
/* AT&T ksh says it prints prompt on fd if it's open
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 writing and is a tty, but it doesn't do it
* (it also doesn't check the interactive flag,
* as is indicated in the Kornshell book).
*/
revert part of the “size reduction” diff (zero size change though): shellf() implies an shf_flush()…
2010-09-15 23:08:19 +02:00
shellf("%s", cp+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
}
}
/* If we are reading from the co-process for the first time,
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
* make sure the other side of the pipe is closed first. This allows
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
* the detection of eof.
*
capitalise AT&T®
2009-06-11 14:42:21 +02:00
* This is not compatible with AT&T ksh... the fd is kept so another
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
* coproc can be started with same output, however, this means eof
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
* can't be detected... This is why it is closed here.
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
* If this call is removed, remove the eof check below, too.
* coproc_readw_close(fd);
*/
if (historyr)
Xinit(xs, xp, 128, ATEMP);
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
expanding = false;
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
Xinit(cs, ccp, 128, 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
for (; *wp != NULL; wp++) {
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
for (ccp = Xstring(cs, ccp); ; ) {
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (c == '\n' || c == EOF)
break;
while (1) {
c = shf_getc(shf);
if (c == '\0')
continue;
if (c == EOF && shf_error(shf) &&
shf_errno(shf) == EINTR) {
/* Was the offending signal one that
* would normally kill a process?
* If so, pretend the read was killed.
*/
ecode = fatal_trap_check();
/* non fatal (eg, CHLD), carry on */
if (!ecode) {
shf_clearerr(shf);
continue;
}
}
break;
}
if (historyr) {
Xcheck(xs, xp);
Xput(xs, xp, c);
}
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
Xcheck(cs, ccp);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (expanding) {
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
expanding = false;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (c == '\n') {
c = 0;
if (Flag(FTALKING_I) && isatty(fd)) {
/* set prompt in case this is
* called from .profile or $ENV
*/
set_prompt(PS2, NULL);
pprompt(prompt, 0);
}
} else if (c != EOF)
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
Xput(cs, ccp, 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
continue;
}
if (expande && c == '\\') {
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
expanding = true;
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
continue;
}
if (c == '\n' || c == EOF)
break;
if (ctype(c, C_IFS)) {
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
if (Xlength(cs, ccp) == 0 && ctype(c, C_IFSWS))
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
continue;
if (wp[1])
break;
}
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
Xput(cs, ccp, 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
}
/* strip trailing IFS white space from last variable */
if (!wp[1])
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
while (Xlength(cs, ccp) && ctype(ccp[-1], C_IFS) &&
ctype(ccp[-1], C_IFSWS))
ccp--;
Xput(cs, ccp, '\0');
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
vp = global(*wp);
/* Must be done before setting export. */
if (vp->flag & RDONLY) {
shf_flush(shf);
shave off another 468 bytes: we’re 300 bytes smaller than BEFORE the cat builtin was added now… (also removed utf-8 from source files, in favour of just ASCII)
2010-08-28 22:22:24 +02:00
bi_errorf("%s: %s", *wp, "is read only");
• alloc() can’t fail, afree() can take NULL ‣ macro afreechk() is superfluous • get rid of macro afreechv() by re-doing the “don’t leak that much” code • some KNF (mostly, whitespace and 80c) while here
2008-05-17 20:47:03 +02:00
afree(wpalloc, ATEMP);
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
if (Flag(FEXPORT))
typeset(*wp, EXPORT, 0, 0, 0);
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
if (!setstr(vp, Xstring(cs, ccp), KSH_RETURN_ERROR)) {
shf_flush(shf);
• alloc() can’t fail, afree() can take NULL ‣ macro afreechk() is superfluous • get rid of macro afreechv() by re-doing the “don’t leak that much” code • some KNF (mostly, whitespace and 80c) while here
2008-05-17 20:47:03 +02:00
afree(wpalloc, ATEMP);
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
}
shf_flush(shf);
if (historyr) {
Xput(xs, xp, '\0');
ignore more dups
2008-09-30 21:25:51 +02:00
histsave(&source->line, Xstring(xs, xp), true, false);
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
Xfree(xs, xp);
}
/* if this is the co-process fd, close the file descriptor
* (can get eof if and only if all processes are have died, ie,
* coproc.njobs is 0 and the pipe is closed).
*/
if (c == EOF && !ecode)
coproc_read_close(fd);
• alloc() can’t fail, afree() can take NULL ‣ macro afreechk() is superfluous • get rid of macro afreechv() by re-doing the “don’t leak that much” code • some KNF (mostly, whitespace and 80c) while here
2008-05-17 20:47:03 +02:00
afree(wpalloc, ATEMP);
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
return (ecode ? ecode : c == EOF);
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
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_eval(const 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
{
make mksh -exc 'eval false || true'; echo $? echo 0 not 1 From Debian bug #269067
2005-05-25 11:39:49 +02:00
struct source *s, *saves = source;
While mksh R39 builds fine on MirOS #7s8E on my trusty sparc, pgcc 2.95.3 throws out quite some warnings – fix most of them except most emitted via -Wconversion; work around some others; discard bogus warnings. sync clog
2009-08-08 15:08:53 +02:00
unsigned char savef;
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
int rv;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (ksh_getopt(wp, &builtin_opt, null) == '?')
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
s = pushs(SWORDS, ATEMP);
s->u.strv = wp + builtin_opt.optind;
get rid of special "POSIX"ish mode
2005-07-04 14:27:28 +02:00
fix exit-eval-1 (Debian #550717), sync SUSv4 wording, improve comments
2009-10-15 18:36:27 +02:00
/*-
* The following code handles the case where the command is
* empty due to failed command substitution, for example by
* eval "$(false)"
* This has historically returned 1 by AT&T ksh88. In this
* case, shell() will not set or change exstat because the
* compiled tree is empty, so it will use the value we pass
* from subst_exstat, which is cleared in execute(), so it
* should have been 0 if there were no substitutions.
get rid of special "POSIX"ish mode
2005-07-04 14:27:28 +02:00
*
fix exit-eval-1 (Debian #550717), sync SUSv4 wording, improve comments
2009-10-15 18:36:27 +02:00
* POSIX however says we don't do this, even though it is
* traditionally done. AT&T ksh93 agrees with POSIX, so we
* do. The following is an excerpt from SUSv4 [1003.2-2008]:
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
*
fix exit-eval-1 (Debian #550717), sync SUSv4 wording, improve comments
2009-10-15 18:36:27 +02:00
* 2.9.1: Simple Commands
get rid of special "POSIX"ish mode
2005-07-04 14:27:28 +02:00
* ... If there is a command name, execution shall
fix exit-eval-1 (Debian #550717), sync SUSv4 wording, improve comments
2009-10-15 18:36:27 +02:00
* continue as described in 2.9.1.1 [Command Search
* and Execution]. If there is no command name, but
* the command contained a command substitution, the
* command shall complete with the exit status of the
* last command substitution performed.
* 2.9.1.1: Command Search and Execution
* (1) a. If the command name matches the name of a
* special built-in utility, that special built-in
get rid of special "POSIX"ish mode
2005-07-04 14:27:28 +02:00
* utility shall be invoked.
fix exit-eval-1 (Debian #550717), sync SUSv4 wording, improve comments
2009-10-15 18:36:27 +02:00
* 2.14.5: eval
* If there are no arguments, or only null arguments,
* eval shall return a zero exit status; ...
get rid of special "POSIX"ish mode
2005-07-04 14:27:28 +02:00
*/
fix exit-eval-1 (Debian #550717), sync SUSv4 wording, improve comments
2009-10-15 18:36:27 +02:00
/* exstat = subst_exstat; */ /* AT&T ksh88 */
exstat = 0; /* SUSv4 */
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
make mksh -exc 'eval false || true'; echo $? echo 0 not 1 From Debian bug #269067
2005-05-25 11:39:49 +02:00
savef = Flag(FERREXIT);
Flag(FERREXIT) = 0;
rv = shell(s, false);
Flag(FERREXIT) = savef;
source = saves;
• fix memory leaks found by coverity from netbsd via oksh we had the NULL pointer deref already fixed • avoid a bogus not-setting the return value of edit.c:x_file_glob() introduced by the above change in oksh • escape ? as well (but not ] because that’s wrong) reminded by cbiere@netbsd via oksh • Unsetting a non-existent variable is not an error. See http://www.opengroup.org/onlinepubs/009695399/utilities/unset.html report from Arkadiusz Miskiewicz; fixed based on http://cvs.pld-linux.org diff via oksh but modified slightly • Be more smart waiting for input for non-interactive scripts. Fix based on a diff from debian: see their bug#296446 (via oksh) modified slightly this also fixes cnuke@’s “mksh busy loop” problem, for which I never received a bug report, but the Debian bug page contains a set of two scripts to reproduce this before (and no longer after) this commit • some KNF • bump version
2007-09-09 20:06:42 +02:00
afree(s, ATEMP);
make mksh -exc 'eval false || true'; echo $? echo 0 not 1 From Debian bug #269067
2005-05-25 11:39:49 +02:00
return (rv);
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
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_trap(const 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
{
int i;
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
const char *s;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
Trap *p;
if (ksh_getopt(wp, &builtin_opt, null) == '?')
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
wp += builtin_opt.optind;
if (*wp == NULL) {
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
for (p = sigtraps, i = NSIG+1; --i >= 0; p++)
if (p->trap != NULL) {
more • int → bool • shprintf("foo") → shf_puts("foo", shl_stdout) • shprintf("%s", foo) → shf_puts(foo, shl_stdout) • shf_puts("x", foo) → shf_putc('x', foo)
2008-04-01 23:50:58 +02:00
shf_puts("trap -- ", shl_stdout);
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
print_value_quoted(p->trap);
shprintf(" %s\n", p->name);
}
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
return (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
}
/*
* Use case sensitive lookup for first arg so the
* command 'exit' isn't confused with the pseudo-signal
* 'EXIT'.
*/
s = (gettrap(*wp, false) == NULL) ? *wp++ : NULL; /* get command */
if (s != NULL && s[0] == '-' && s[1] == '\0')
s = NULL;
/* set/clear traps */
while (*wp != NULL) {
p = gettrap(*wp++, true);
if (p == NULL) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("bad signal '%s'", wp[-1]);
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
settrap(p, s);
}
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
return (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
}
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_exitreturn(const 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
{
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int n, how = LEXIT;
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
const char *arg;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (ksh_getopt(wp, &builtin_opt, null) == '?')
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
arg = wp[builtin_opt.optind];
if (arg) {
if (!getn(arg, &n)) {
exstat = 1;
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
warningf(true, "%s: %s", arg, "bad number");
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
exstat = n;
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
} else if (trap_exstat != -1)
exstat = trap_exstat;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (wp[0][0] == 'r') { /* return */
struct env *ep;
/* need to tell if this is exit or return so trap exit will
* work right (POSIX)
*/
for (ep = e; ep; ep = ep->oenv)
if (STOP_RETURN(ep->type)) {
how = LRETURN;
break;
}
}
if (how == LEXIT && !really_exit && j_stopped_running()) {
really_exit = 1;
how = LSHELL;
}
quitenv(NULL); /* get rid of any i/o redirections */
unwind(how);
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
/* NOTREACHED */
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_brkcont(const 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
{
int n, quit;
struct env *ep, *last_ep = NULL;
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
const char *arg;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (ksh_getopt(wp, &builtin_opt, null) == '?')
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
arg = wp[builtin_opt.optind];
if (!arg)
n = 1;
else if (!bi_getn(arg, &n))
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
quit = n;
if (quit <= 0) {
capitalise AT&T®
2009-06-11 14:42:21 +02:00
/* AT&T ksh does this for non-interactive shells only - weird */
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s: %s", arg, "bad value");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
/* Stop at E_NONE, E_PARSE, E_FUNC, or E_INCL */
for (ep = e; ep && !STOP_BRKCONT(ep->type); ep = ep->oenv)
if (ep->type == E_LOOP) {
if (--quit == 0)
break;
ep->flags |= EF_BRKCONT_PASS;
last_ep = ep;
}
if (quit) {
capitalise AT&T®
2009-06-11 14:42:21 +02:00
/* AT&T ksh doesn't print a message - just does what it
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
* can. We print a message 'cause it helps in debugging
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
* scripts, but don't generate an error (ie, keep going).
*/
if (n == quit) {
shave off another 468 bytes: we’re 300 bytes smaller than BEFORE the cat builtin was added now… (also removed utf-8 from source files, in favour of just ASCII)
2010-08-28 22:22:24 +02:00
warningf(true, "%s: %s %s", wp[0], "can't", wp[0]);
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
return (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
}
/* POSIX says if n is too big, the last enclosing loop
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
* shall be used. Doesn't say to print an error but we
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 anyway 'cause the user messed up.
*/
Fix for Coverity CID #6 (null pointer dereference in error path)
2007-05-13 20:15:25 +02:00
if (last_ep)
last_ep->flags &= ~EF_BRKCONT_PASS;
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
warningf(true, "%s: can only %s %d level(s)",
wp[0], wp[0], n - quit);
}
unwind(*wp[0] == 'b' ? LBREAK : LCONTIN);
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
/* NOTREACHED */
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_set(const 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
{
llvm/clang scan-build is now content…
2009-12-05 18:43:50 +01:00
int argi;
bool setargs;
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 block *l = e->loc;
Borland C++ found these
2007-07-01 23:10:29 +02:00
const char **owp;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (wp[1] == NULL) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
static const char *args[] = { T_set, "-", NULL };
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
return (c_typeset(args));
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
}
argi = parse_args(wp, OF_SET, &setargs);
if (argi < 0)
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
/* set $# and $* */
if (setargs) {
llvm/clang scan-build is now content…
2009-12-05 18:43:50 +01:00
wp += argi - 1;
owp = 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
wp[0] = l->argv[0]; /* save $0 */
while (*++wp != NULL)
* 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
strdupx(*wp, *wp, &l->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
l->argc = wp - owp - 1;
• 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
l->argv = alloc2(l->argc + 2, sizeof(char *), &l->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
for (wp = l->argv; (*wp++ = *owp++) != NULL; )
;
}
fix exit-eval-1 (Debian #550717), sync SUSv4 wording, improve comments
2009-10-15 18:36:27 +02:00
/*-
another exit code in substitution questionable thing split this one by set ±o sh
2009-10-15 16:58:51 +02:00
* POSIX says set exit status is 0, but old scripts that use
fix exit-eval-1 (Debian #550717), sync SUSv4 wording, improve comments
2009-10-15 18:36:27 +02:00
* getopt(1) use the construct
* set -- $(getopt ab: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
* which assumes the exit value set will be that of the $()
* (subst_exstat is cleared in execute() so that it will be 0
* if there are no command substitutions).
To solve the incompatibility issues between mksh-current, old mksh versions and vendor pdksh versions, re-introduce FPOSIX alongside FSH. The semantics are now: ‣ set -o posix ⇒ • disable brace expansion and FSH when triggered • use Debian Policy 10.4 compliant non-XSI “echo” builtin • do not keep file descriptors > 2 to ksh ‣ set -o sh ⇒ • set automatically #ifdef MKSH_BINSHREDUCED • disable brace expansion and FPOSIX when triggered • use Debian Policy 10.4 compliant non-XSI “echo” builtin • do not keep file descriptors > 2 to ksh • trigger MKSH_MIDNIGHTBSD01ASH_COMPAT mode if compiled in • make “set -- $(getopt ab:c "$@")” construct work Note that the set/getopt one used to behave POSIXly only with FSH or FPOSIX (depending on the mksh version) set and Bourne-ish with it not set, so this changes default mksh behaviour to POSIX!
2010-01-28 16:18:51 +01:00
* Switched ksh (!posix !sh) to POSIX in mksh R39b.
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 solve the incompatibility issues between mksh-current, old mksh versions and vendor pdksh versions, re-introduce FPOSIX alongside FSH. The semantics are now: ‣ set -o posix ⇒ • disable brace expansion and FSH when triggered • use Debian Policy 10.4 compliant non-XSI “echo” builtin • do not keep file descriptors > 2 to ksh ‣ set -o sh ⇒ • set automatically #ifdef MKSH_BINSHREDUCED • disable brace expansion and FPOSIX when triggered • use Debian Policy 10.4 compliant non-XSI “echo” builtin • do not keep file descriptors > 2 to ksh • trigger MKSH_MIDNIGHTBSD01ASH_COMPAT mode if compiled in • make “set -- $(getopt ab:c "$@")” construct work Note that the set/getopt one used to behave POSIXly only with FSH or FPOSIX (depending on the mksh version) set and Bourne-ish with it not set, so this changes default mksh behaviour to POSIX!
2010-01-28 16:18:51 +01:00
return (Flag(FSH) ? subst_exstat : 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
}
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_unset(const 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
{
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
const char *id;
• fix memory leaks found by coverity from netbsd via oksh we had the NULL pointer deref already fixed • avoid a bogus not-setting the return value of edit.c:x_file_glob() introduced by the above change in oksh • escape ? as well (but not ] because that’s wrong) reminded by cbiere@netbsd via oksh • Unsetting a non-existent variable is not an error. See http://www.opengroup.org/onlinepubs/009695399/utilities/unset.html report from Arkadiusz Miskiewicz; fixed based on http://cvs.pld-linux.org diff via oksh but modified slightly • Be more smart waiting for input for non-interactive scripts. Fix based on a diff from debian: see their bug#296446 (via oksh) modified slightly this also fixes cnuke@’s “mksh busy loop” problem, for which I never received a bug report, but the Debian bug page contains a set of two scripts to reproduce this before (and no longer after) this commit • some KNF • bump version
2007-09-09 20:06:42 +02:00
int optc;
bool unset_var = true;
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
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt, "fv")) != -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
switch (optc) {
case 'f':
• fix memory leaks found by coverity from netbsd via oksh we had the NULL pointer deref already fixed • avoid a bogus not-setting the return value of edit.c:x_file_glob() introduced by the above change in oksh • escape ? as well (but not ] because that’s wrong) reminded by cbiere@netbsd via oksh • Unsetting a non-existent variable is not an error. See http://www.opengroup.org/onlinepubs/009695399/utilities/unset.html report from Arkadiusz Miskiewicz; fixed based on http://cvs.pld-linux.org diff via oksh but modified slightly • Be more smart waiting for input for non-interactive scripts. Fix based on a diff from debian: see their bug#296446 (via oksh) modified slightly this also fixes cnuke@’s “mksh busy loop” problem, for which I never received a bug report, but the Debian bug page contains a set of two scripts to reproduce this before (and no longer after) this commit • some KNF • bump version
2007-09-09 20:06:42 +02:00
unset_var = false;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case 'v':
• fix memory leaks found by coverity from netbsd via oksh we had the NULL pointer deref already fixed • avoid a bogus not-setting the return value of edit.c:x_file_glob() introduced by the above change in oksh • escape ? as well (but not ] because that’s wrong) reminded by cbiere@netbsd via oksh • Unsetting a non-existent variable is not an error. See http://www.opengroup.org/onlinepubs/009695399/utilities/unset.html report from Arkadiusz Miskiewicz; fixed based on http://cvs.pld-linux.org diff via oksh but modified slightly • Be more smart waiting for input for non-interactive scripts. Fix based on a diff from debian: see their bug#296446 (via oksh) modified slightly this also fixes cnuke@’s “mksh busy loop” problem, for which I never received a bug report, but the Debian bug page contains a set of two scripts to reproduce this before (and no longer after) this commit • some KNF • bump version
2007-09-09 20:06:42 +02:00
unset_var = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case '?':
• fix memory leaks found by coverity from netbsd via oksh we had the NULL pointer deref already fixed • avoid a bogus not-setting the return value of edit.c:x_file_glob() introduced by the above change in oksh • escape ? as well (but not ] because that’s wrong) reminded by cbiere@netbsd via oksh • Unsetting a non-existent variable is not an error. See http://www.opengroup.org/onlinepubs/009695399/utilities/unset.html report from Arkadiusz Miskiewicz; fixed based on http://cvs.pld-linux.org diff via oksh but modified slightly • Be more smart waiting for input for non-interactive scripts. Fix based on a diff from debian: see their bug#296446 (via oksh) modified slightly this also fixes cnuke@’s “mksh busy loop” problem, for which I never received a bug report, but the Debian bug page contains a set of two scripts to reproduce this before (and no longer after) this commit • some KNF • bump version
2007-09-09 20:06:42 +02:00
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
wp += builtin_opt.optind;
for (; (id = *wp) != NULL; wp++)
if (unset_var) { /* unset variable */
Add “unset foo[*]” mksh extension, which allows to unset the *contents* of foo[0] (but not its attributes), and the rest of the array, so that later “set +A foo bar” will set foo[0]=bar but retain the attributes. This is important, because, in the future, arrays will have different attributes per element, instead of all the same (which, actually, is not entirely true right now either, since “unset foo[0]” will not mo- dify the attributes of a foo[1] existing at that point in time), where foo[$newkey] will inherit from foo[0], but typeset foo will only affect foo[0] no longer foo[*] in the future. (The rules about typeset=local will still apply, as they affect creation of variables in a scope.)
2010-01-25 15:11:29 +01:00
struct tbl *vp;
char *cp = NULL;
size_t n;
n = strlen(id);
if (n > 3 && id[n-3] == '[' && id[n-2] == '*' &&
id[n-1] == ']') {
strndupx(cp, id, n - 3, ATEMP);
id = cp;
optc = 3;
} else
optc = vstrchr(id, '[') ? 0 : 1;
vp = global(id);
afree(cp, 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
if ((vp->flag&RDONLY)) {
shave off another 468 bytes: we’re 300 bytes smaller than BEFORE the cat builtin was added now… (also removed utf-8 from source files, in favour of just ASCII)
2010-08-28 22:22:24 +02:00
bi_errorf("%s: %s", vp->name, "is read only");
• fix memory leaks found by coverity from netbsd via oksh we had the NULL pointer deref already fixed • avoid a bogus not-setting the return value of edit.c:x_file_glob() introduced by the above change in oksh • escape ? as well (but not ] because that’s wrong) reminded by cbiere@netbsd via oksh • Unsetting a non-existent variable is not an error. See http://www.opengroup.org/onlinepubs/009695399/utilities/unset.html report from Arkadiusz Miskiewicz; fixed based on http://cvs.pld-linux.org diff via oksh but modified slightly • Be more smart waiting for input for non-interactive scripts. Fix based on a diff from debian: see their bug#296446 (via oksh) modified slightly this also fixes cnuke@’s “mksh busy loop” problem, for which I never received a bug report, but the Debian bug page contains a set of two scripts to reproduce this before (and no longer after) this commit • some KNF • bump version
2007-09-09 20:06:42 +02:00
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
Add “unset foo[*]” mksh extension, which allows to unset the *contents* of foo[0] (but not its attributes), and the rest of the array, so that later “set +A foo bar” will set foo[0]=bar but retain the attributes. This is important, because, in the future, arrays will have different attributes per element, instead of all the same (which, actually, is not entirely true right now either, since “unset foo[0]” will not mo- dify the attributes of a foo[1] existing at that point in time), where foo[$newkey] will inherit from foo[0], but typeset foo will only affect foo[0] no longer foo[*] in the future. (The rules about typeset=local will still apply, as they affect creation of variables in a scope.)
2010-01-25 15:11:29 +01:00
unset(vp, optc);
• fix memory leaks found by coverity from netbsd via oksh we had the NULL pointer deref already fixed • avoid a bogus not-setting the return value of edit.c:x_file_glob() introduced by the above change in oksh • escape ? as well (but not ] because that’s wrong) reminded by cbiere@netbsd via oksh • Unsetting a non-existent variable is not an error. See http://www.opengroup.org/onlinepubs/009695399/utilities/unset.html report from Arkadiusz Miskiewicz; fixed based on http://cvs.pld-linux.org diff via oksh but modified slightly • Be more smart waiting for input for non-interactive scripts. Fix based on a diff from debian: see their bug#296446 (via oksh) modified slightly this also fixes cnuke@’s “mksh busy loop” problem, for which I never received a bug report, but the Debian bug page contains a set of two scripts to reproduce this before (and no longer after) this commit • some KNF • bump version
2007-09-09 20:06:42 +02:00
} else /* unset function */
define(id, NULL);
return (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
}
static void
commit Syllable-related improvement: simplify p_time
2009-05-20 12:10:02 +02:00
p_time(struct shf *shf, bool posix, long tv_sec, int tv_usec, int width,
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
const char *prefix, const char *suffix)
{
commit Syllable-related improvement: simplify p_time
2009-05-20 12:10:02 +02:00
tv_usec /= 10000;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (posix)
commit Syllable-related improvement: simplify p_time
2009-05-20 12:10:02 +02:00
shf_fprintf(shf, "%s%*ld.%02d%s", prefix, width,
tv_sec, tv_usec, suffix);
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
commit Syllable-related improvement: simplify p_time
2009-05-20 12:10:02 +02:00
shf_fprintf(shf, "%s%*ldm%d.%02ds%s", prefix, width,
tv_sec / 60, (int)(tv_sec % 60), tv_usec, suffix);
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
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
c_times(const char **wp MKSH_A_UNUSED)
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 rusage usage;
(experimental) implement getrusage via times if not found
2009-04-03 11:39:07 +02:00
getrusage(RUSAGE_SELF, &usage);
commit Syllable-related improvement: simplify p_time
2009-05-20 12:10:02 +02:00
p_time(shl_stdout, false, usage.ru_utime.tv_sec,
usage.ru_utime.tv_usec, 0, null, " ");
p_time(shl_stdout, false, usage.ru_stime.tv_sec,
usage.ru_stime.tv_usec, 0, null, "\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
(experimental) implement getrusage via times if not found
2009-04-03 11:39:07 +02:00
getrusage(RUSAGE_CHILDREN, &usage);
commit Syllable-related improvement: simplify p_time
2009-05-20 12:10:02 +02:00
p_time(shl_stdout, false, usage.ru_utime.tv_sec,
usage.ru_utime.tv_usec, 0, null, " ");
p_time(shl_stdout, false, usage.ru_stime.tv_sec,
usage.ru_stime.tv_usec, 0, null, "\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
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
return (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
}
/*
* time pipeline (really a statement, not a built-in command)
*/
int
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
timex(struct op *t, int f, volatile int *xerrok)
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 TF_NOARGS BIT(0)
#define TF_NOREAL BIT(1) /* don't report real time */
* rename "set -o posix" (FPOSIX) to "set -o sh" (FSH) because it's not just a "somewhat more POSIX" but also a "/bin/sh legacy kludge" mode * consistently capitalise POSIX and SUSv3/SUSv4 (same as AT&T ksh) and Bourne shell
2009-10-02 20:08:37 +02:00
#define TF_POSIX BIT(2) /* report in POSIX format */
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int rv = 0, tf = 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
struct rusage ru0, ru1, cru0, cru1;
struct timeval usrtime, systime, tv0, tv1;
gettimeofday(&tv0, NULL);
getrusage(RUSAGE_SELF, &ru0);
getrusage(RUSAGE_CHILDREN, &cru0);
if (t->left) {
/*
* Two ways of getting cpu usage of a command: just use t0
* and t1 (which will get cpu usage from other jobs that
* finish while we are executing t->left), or get the
capitalise AT&T®
2009-06-11 14:42:21 +02:00
* cpu usage of t->left. AT&T ksh does the former, while
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
* pdksh tries to do the later (the j_usrtime hack doesn't
* really work as it only counts the last job).
*/
timerclear(&j_usrtime);
timerclear(&j_systime);
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
rv = execute(t->left, f | XTIME, xerrok);
• merge final version of the stack-free diff as committed by jaredy@openbsd thanks for helping with the bug • merge RCS IDs • bump mksh version
2008-08-02 19:45:12 +02:00
if (t->left->type == TCOM)
tf |= t->left->str[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
gettimeofday(&tv1, NULL);
getrusage(RUSAGE_SELF, &ru1);
getrusage(RUSAGE_CHILDREN, &cru1);
} else
tf = TF_NOARGS;
if (tf & TF_NOARGS) { /* ksh93 - report shell times (shell+kids) */
tf |= TF_NOREAL;
timeradd(&ru0.ru_utime, &cru0.ru_utime, &usrtime);
timeradd(&ru0.ru_stime, &cru0.ru_stime, &systime);
} else {
timersub(&ru1.ru_utime, &ru0.ru_utime, &usrtime);
timeradd(&usrtime, &j_usrtime, &usrtime);
timersub(&ru1.ru_stime, &ru0.ru_stime, &systime);
timeradd(&systime, &j_systime, &systime);
}
if (!(tf & TF_NOREAL)) {
timersub(&tv1, &tv0, &tv1);
if (tf & TF_POSIX)
commit Syllable-related improvement: simplify p_time
2009-05-20 12:10:02 +02:00
p_time(shl_out, true, tv1.tv_sec, tv1.tv_usec,
5, "real ", "\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
else
commit Syllable-related improvement: simplify p_time
2009-05-20 12:10:02 +02:00
p_time(shl_out, false, tv1.tv_sec, tv1.tv_usec,
5, null, " real ");
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
if (tf & TF_POSIX)
commit Syllable-related improvement: simplify p_time
2009-05-20 12:10:02 +02:00
p_time(shl_out, true, usrtime.tv_sec, usrtime.tv_usec,
5, "user ", "\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
else
commit Syllable-related improvement: simplify p_time
2009-05-20 12:10:02 +02:00
p_time(shl_out, false, usrtime.tv_sec, usrtime.tv_usec,
5, null, " user ");
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (tf & TF_POSIX)
commit Syllable-related improvement: simplify p_time
2009-05-20 12:10:02 +02:00
p_time(shl_out, true, systime.tv_sec, systime.tv_usec,
5, "sys ", "\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
else
commit Syllable-related improvement: simplify p_time
2009-05-20 12:10:02 +02:00
p_time(shl_out, false, systime.tv_sec, systime.tv_usec,
5, null, " system\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
shf_flush(shl_out);
merge non-Plan9-specific stuff from the branch, add KNF, etc.
2006-08-24 22:32:53 +02:00
return (rv);
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
}
void
timex_hook(struct op *t, char **volatile *app)
{
char **wp = *app;
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int optc, i, j;
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 opt;
ksh_getopt_reset(&opt, 0);
opt.optind = 0; /* start at the start */
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
while ((optc = ksh_getopt((const char **)wp, &opt, ":p")) != -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
switch (optc) {
case 'p':
t->str[0] |= TF_POSIX;
break;
case '?':
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
errorf("time: -%s %s", opt.optarg,
"unknown 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
case ':':
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
errorf("time: -%s %s", opt.optarg,
"requires an 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
}
/* Copy command words down over options. */
if (opt.optind != 0) {
for (i = 0; i < opt.optind; i++)
afree(wp[i], ATEMP);
for (i = 0, j = opt.optind; (wp[i] = wp[j]); i++, j++)
;
}
if (!wp[0])
t->str[0] |= TF_NOARGS;
*app = wp;
}
/* exec with no args - args case is taken care of in comexec() */
int
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
c_exec(const char **wp MKSH_A_UNUSED)
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 i;
/* make sure redirects stay in place */
if (e->savefd != NULL) {
for (i = 0; i < NUFILE; i++) {
if (e->savefd[i] > 0)
close(e->savefd[i]);
To solve the incompatibility issues between mksh-current, old mksh versions and vendor pdksh versions, re-introduce FPOSIX alongside FSH. The semantics are now: ‣ set -o posix ⇒ • disable brace expansion and FSH when triggered • use Debian Policy 10.4 compliant non-XSI “echo” builtin • do not keep file descriptors > 2 to ksh ‣ set -o sh ⇒ • set automatically #ifdef MKSH_BINSHREDUCED • disable brace expansion and FPOSIX when triggered • use Debian Policy 10.4 compliant non-XSI “echo” builtin • do not keep file descriptors > 2 to ksh • trigger MKSH_MIDNIGHTBSD01ASH_COMPAT mode if compiled in • make “set -- $(getopt ab:c "$@")” construct work Note that the set/getopt one used to behave POSIXly only with FSH or FPOSIX (depending on the mksh version) set and Bourne-ish with it not set, so this changes default mksh behaviour to POSIX!
2010-01-28 16:18:51 +01:00
/*
* keep all file descriptors > 2 private for ksh,
* but not for POSIX or legacy/kludge sh
*/
if (!Flag(FPOSIX) && !Flag(FSH) && i > 2 &&
e->savefd[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
fcntl(i, F_SETFD, FD_CLOEXEC);
}
e->savefd = NULL;
}
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
return (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
}
• new way of checking for mknod & friends, due to tcc vs glibc weirdness • bump vsn for the code restructuring
2007-07-31 13:11:25 +02:00
#if HAVE_MKNOD
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
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_mknod(const char **wp)
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
{
int argc, optc, rv = 0;
bool ismkfifo = false;
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
const char **argv;
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
void *set = NULL;
mode_t mode = 0, oldmode = 0;
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt, "m:")) != -1) {
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
switch (optc) {
case 'm':
set = setmode(builtin_opt.optarg);
if (set == NULL) {
bi_errorf("invalid file mode");
return (1);
}
While mksh R39 builds fine on MirOS #7s8E on my trusty sparc, pgcc 2.95.3 throws out quite some warnings – fix most of them except most emitted via -Wconversion; work around some others; discard bogus warnings. sync clog
2009-08-08 15:08:53 +02:00
mode = getmode(set, (mode_t)(DEFFILEMODE));
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
free(set);
break;
default:
goto c_mknod_usage;
}
}
argv = &wp[builtin_opt.optind];
apply most of OpenBSD’s │ Fix usage string for mknod builtin. but don’t do a binary change as it doesn’t actually change anything XXX fix all these usages anyway XXX cd: cd: /home/tg/... - No such file or directory XXX /bin/mksh: mknod: usage: mknod [-m mode] name [b | c] major minor XXX /bin/mksh: mknod: mknod: No such file or directory XXX etc. – but find out what POSuX demands ☹
2009-05-16 19:33:10 +02:00
if (argv[0] == 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
goto c_mknod_usage;
for (argc = 0; argv[argc]; argc++)
;
if (argc == 2 && argv[1][0] == 'p')
ismkfifo = true;
else if (argc != 4 || (argv[1][0] != 'b' && argv[1][0] != 'c'))
goto c_mknod_usage;
if (set != NULL)
While mksh R39 builds fine on MirOS #7s8E on my trusty sparc, pgcc 2.95.3 throws out quite some warnings – fix most of them except most emitted via -Wconversion; work around some others; discard bogus warnings. sync clog
2009-08-08 15:08:53 +02:00
oldmode = umask((mode_t)0);
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
else
mode = DEFFILEMODE;
mode |= (argv[1][0] == 'b') ? S_IFBLK :
(argv[1][0] == 'c') ? S_IFCHR : 0;
if (!ismkfifo) {
On Solaris: ../mksh/funcs.c:2254: warning: declaration of 'major' shadows a global declaration /usr/include/sys/mkdev.h:68: warning: shadowed declaration is here ../mksh/funcs.c:2254: warning: declaration of 'minor' shadows a global declaration /usr/include/sys/mkdev.h:69: warning: shadowed declaration is here (that's yofuh's system) SunOS mirfoo 5.10 Generic_125100-04 sun4u sparc SUNW,Ultra-80 Reading specs from /usr/local/lib/gcc/sparc-sun-solaris2.10/3.4.6/specs Configured with: ../configure --with-as=/usr/ccs/bin/as --with-ld=/usr/ccs/bin/ld --enable-shared --enable-languages=c,c++,f77 Thread model: posix gcc version 3.4.6
2007-06-05 21:18:11 +02:00
unsigned long majnum, minnum;
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
dev_t dv;
char *c;
On Solaris: ../mksh/funcs.c:2254: warning: declaration of 'major' shadows a global declaration /usr/include/sys/mkdev.h:68: warning: shadowed declaration is here ../mksh/funcs.c:2254: warning: declaration of 'minor' shadows a global declaration /usr/include/sys/mkdev.h:69: warning: shadowed declaration is here (that's yofuh's system) SunOS mirfoo 5.10 Generic_125100-04 sun4u sparc SUNW,Ultra-80 Reading specs from /usr/local/lib/gcc/sparc-sun-solaris2.10/3.4.6/specs Configured with: ../configure --with-as=/usr/ccs/bin/as --with-ld=/usr/ccs/bin/ld --enable-shared --enable-languages=c,c++,f77 Thread model: posix gcc version 3.4.6
2007-06-05 21:18:11 +02:00
majnum = strtoul(argv[2], &c, 0);
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
if ((c == argv[2]) || (*c != '\0')) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("non-numeric %s %s '%s'", "device", "major", argv[2]);
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
goto c_mknod_err;
}
On Solaris: ../mksh/funcs.c:2254: warning: declaration of 'major' shadows a global declaration /usr/include/sys/mkdev.h:68: warning: shadowed declaration is here ../mksh/funcs.c:2254: warning: declaration of 'minor' shadows a global declaration /usr/include/sys/mkdev.h:69: warning: shadowed declaration is here (that's yofuh's system) SunOS mirfoo 5.10 Generic_125100-04 sun4u sparc SUNW,Ultra-80 Reading specs from /usr/local/lib/gcc/sparc-sun-solaris2.10/3.4.6/specs Configured with: ../configure --with-as=/usr/ccs/bin/as --with-ld=/usr/ccs/bin/ld --enable-shared --enable-languages=c,c++,f77 Thread model: posix gcc version 3.4.6
2007-06-05 21:18:11 +02:00
minnum = strtoul(argv[3], &c, 0);
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
if ((c == argv[3]) || (*c != '\0')) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("non-numeric %s %s '%s'", "device", "minor", argv[3]);
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
goto c_mknod_err;
}
On Solaris: ../mksh/funcs.c:2254: warning: declaration of 'major' shadows a global declaration /usr/include/sys/mkdev.h:68: warning: shadowed declaration is here ../mksh/funcs.c:2254: warning: declaration of 'minor' shadows a global declaration /usr/include/sys/mkdev.h:69: warning: shadowed declaration is here (that's yofuh's system) SunOS mirfoo 5.10 Generic_125100-04 sun4u sparc SUNW,Ultra-80 Reading specs from /usr/local/lib/gcc/sparc-sun-solaris2.10/3.4.6/specs Configured with: ../configure --with-as=/usr/ccs/bin/as --with-ld=/usr/ccs/bin/ld --enable-shared --enable-languages=c,c++,f77 Thread model: posix gcc version 3.4.6
2007-06-05 21:18:11 +02:00
dv = makedev(majnum, minnum);
• 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
if ((unsigned long)(major(dv)) != majnum) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s %s too large: %lu", "device", "major", majnum);
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
goto c_mknod_err;
}
• 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
if ((unsigned long)(minor(dv)) != minnum) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s %s too large: %lu", "device", "minor", minnum);
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
goto c_mknod_err;
}
if (mknod(argv[0], mode, dv))
goto c_mknod_failed;
} else if (mkfifo(argv[0], mode)) {
style(9)
2006-08-01 15:43:28 +02:00
c_mknod_failed:
optimise error messages, option parsing, and make more builtins recognise "--", costs us 20 .text 0 .data 0 .bss
2010-09-05 21:51:35 +02:00
bi_errorf("%s: %s", argv[0], strerror(errno));
style(9)
2006-08-01 15:43:28 +02:00
c_mknod_err:
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
rv = 1;
}
if (set)
umask(oldmode);
return (rv);
style(9)
2006-08-01 15:43:28 +02:00
c_mknod_usage:
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s: %s", "usage", "mknod [-m mode] name b|c major minor");
bi_errorf("%s: %s", "usage", "mknod [-m mode] name p");
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
return (1);
}
don't compile mknod(1) builtin if MKSH_SMALL saves 1037 text, 20 data (on i386)
2006-11-09 23:18:10 +01: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
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
/* test(1) accepts the following grammar:
oexpr ::= aexpr | aexpr "-o" oexpr ;
aexpr ::= nexpr | nexpr "-a" aexpr ;
nexpr ::= primary | "!" nexpr ;
primary ::= unary-operator operand
| operand binary-operator operand
| operand
| "(" oexpr ")"
;
unary-operator ::= "-a"|"-r"|"-w"|"-x"|"-e"|"-f"|"-d"|"-c"|"-b"|"-p"|
"-u"|"-g"|"-k"|"-s"|"-t"|"-z"|"-n"|"-o"|"-O"|"-G"|
"-L"|"-h"|"-S"|"-H";
binary-operator ::= "="|"=="|"!="|"-eq"|"-ne"|"-ge"|"-gt"|"-le"|"-lt"|
"-nt"|"-ot"|"-ef"|
"<"|">" # rules used for [[ .. ]] expressions
;
operand ::= <any thing>
*/
#define T_ERR_EXIT 2 /* POSIX says > 1 for errors */
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_test(const 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
{
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int argc, res;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
Test_env te;
te.flags = 0;
te.isa = ptest_isa;
te.getopnd = ptest_getopnd;
dead code removal
2007-05-13 20:49:00 +02:00
te.eval = test_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
te.error = ptest_error;
for (argc = 0; wp[argc]; argc++)
;
if (strcmp(wp[0], "[") == 0) {
if (strcmp(wp[--argc], "]") != 0) {
bi_errorf("missing ]");
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
return (T_ERR_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
}
}
te.pos.wp = wp + 1;
te.wp_end = wp + argc;
/*
* Handle the special cases from POSIX.2, section 4.62.4.
* Implementation of all the rules isn't necessary since
* our parser does the right thing for the omitted steps.
*/
if (argc <= 5) {
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
const char **owp = 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
int invert = 0;
tabs, bools
2009-04-07 21:51:47 +02:00
Test_op 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
const char *opnd1, *opnd2;
while (--argc >= 0) {
if ((*te.isa)(&te, TM_END))
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
return (!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
if (argc == 3) {
opnd1 = (*te.getopnd)(&te, TO_NONOP, 1);
revert wrong fix
2008-03-28 19:46:59 +01:00
if ((op = (*te.isa)(&te, TM_BINOP))) {
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
opnd2 = (*te.getopnd)(&te, op, 1);
res = (*te.eval)(&te, op, opnd1,
opnd2, 1);
if (te.flags & TEF_ERROR)
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
return (T_ERR_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
if (invert & 1)
res = !res;
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
return (!res);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
/* back up to opnd1 */
te.pos.wp--;
}
if (argc == 1) {
opnd1 = (*te.getopnd)(&te, TO_NONOP, 1);
get rid of special "POSIX"ish mode
2005-07-04 14:27:28 +02:00
if (strcmp(opnd1, "-t") == 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
break;
res = (*te.eval)(&te, TO_STNZE, opnd1,
NULL, 1);
if (invert & 1)
res = !res;
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
return (!res);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
if ((*te.isa)(&te, TM_NOT)) {
invert++;
} else
break;
}
te.pos.wp = owp + 1;
}
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
return (test_parse(&te));
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
}
/*
* Generic test routines.
*/
Test_op
our test(1) promises we can do string1 < string2, and our /bin/test uses mksh... so we pee (literally) on POSIX and don't accept < and > only for [[ ... ]] operator
2005-10-08 21:31:00 +02:00
test_isop(Test_meta meta, const char *s)
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
{
char sc1;
our test(1) promises we can do string1 < string2, and our /bin/test uses mksh... so we pee (literally) on POSIX and don't accept < and > only for [[ ... ]] operator
2005-10-08 21:31:00 +02:00
const struct t_op *tbl;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
our test(1) promises we can do string1 < string2, and our /bin/test uses mksh... so we pee (literally) on POSIX and don't accept < and > only for [[ ... ]] operator
2005-10-08 21:31:00 +02:00
tbl = meta == TM_UNOP ? u_ops : b_ops;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (*s) {
sc1 = s[1];
our test(1) promises we can do string1 < string2, and our /bin/test uses mksh... so we pee (literally) on POSIX and don't accept < and > only for [[ ... ]] operator
2005-10-08 21:31:00 +02:00
for (; tbl->op_text[0]; tbl++)
if (sc1 == tbl->op_text[1] && !strcmp(s, tbl->op_text))
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
return (tbl->op_num);
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 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
return (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
}
int
test_eval(Test_env *te, Test_op op, const char *opnd1, const char *opnd2,
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
bool do_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
{
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int i, s;
Possible fix for Coverity CID#7: convert options() prototype to unsigned (size_t, in fact), and make an explicitly casted (size_t)-1 the error return code, modelled after what is often used in Unix libraries
2007-05-13 20:33:29 +02:00
size_t k;
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 stat b1, b2;
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
mksh_ari_t v1, v2;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (!do_eval)
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
return (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
Possible fix for Coverity CID#7: convert options() prototype to unsigned (size_t, in fact), and make an explicitly casted (size_t)-1 the error return code, modelled after what is often used in Unix libraries
2007-05-13 20:33:29 +02:00
switch ((int)op) {
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
/*
* Unary Operators
*/
case TO_STNZE: /* -n */
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
return (*opnd1 != '\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
case TO_STZER: /* -z */
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
return (*opnd1 == '\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
case TO_OPTION: /* -o */
another ksh93 feature: test -o ?foo (almost zero cost)
2009-09-07 19:24:49 +02:00
if ((i = *opnd1) == '!' || 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
opnd1++;
Possible fix for Coverity CID#7: convert options() prototype to unsigned (size_t, in fact), and make an explicitly casted (size_t)-1 the error return code, modelled after what is often used in Unix libraries
2007-05-13 20:33:29 +02:00
if ((k = option(opnd1)) == (size_t)-1)
While mksh R39 builds fine on MirOS #7s8E on my trusty sparc, pgcc 2.95.3 throws out quite some warnings – fix most of them except most emitted via -Wconversion; work around some others; discard bogus warnings. sync clog
2009-08-08 15:08:53 +02:00
return (0);
another ksh93 feature: test -o ?foo (almost zero cost)
2009-09-07 19:24:49 +02:00
return (i == '?' ? 1 : i == '!' ? !Flag(k) : Flag(k));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case TO_FILRD: /* -r */
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
return (test_eaccess(opnd1, R_OK) == 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
case TO_FILWR: /* -w */
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
return (test_eaccess(opnd1, W_OK) == 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
case TO_FILEX: /* -x */
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
return (test_eaccess(opnd1, X_OK) == 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
case TO_FILAXST: /* -a */
case TO_FILEXST: /* -e */
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
return (stat(opnd1, &b1) == 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
case TO_FILREG: /* -r */
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
return (stat(opnd1, &b1) == 0 && S_ISREG(b1.st_mode));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case TO_FILID: /* -d */
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
return (stat(opnd1, &b1) == 0 && S_ISDIR(b1.st_mode));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case TO_FILCDEV: /* -c */
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
return (stat(opnd1, &b1) == 0 && S_ISCHR(b1.st_mode));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case TO_FILBDEV: /* -b */
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
return (stat(opnd1, &b1) == 0 && S_ISBLK(b1.st_mode));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case TO_FILFIFO: /* -p */
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
return (stat(opnd1, &b1) == 0 && S_ISFIFO(b1.st_mode));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case TO_FILSYM: /* -h -L */
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
return (lstat(opnd1, &b1) == 0 && S_ISLNK(b1.st_mode));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case TO_FILSOCK: /* -S */
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
return (stat(opnd1, &b1) == 0 && S_ISSOCK(b1.st_mode));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case TO_FILCDF:/* -H HP context dependent files (directories) */
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
return (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
case TO_FILSETU: /* -u */
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
return (stat(opnd1, &b1) == 0 &&
(b1.st_mode & S_ISUID) == S_ISUID);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case TO_FILSETG: /* -g */
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
return (stat(opnd1, &b1) == 0 &&
(b1.st_mode & S_ISGID) == S_ISGID);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case TO_FILSTCK: /* -k */
merge non-Plan9-specific stuff from the branch, add KNF, etc.
2006-08-24 22:32:53 +02:00
#ifdef S_ISVTX
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
return (stat(opnd1, &b1) == 0 &&
(b1.st_mode & S_ISVTX) == S_ISVTX);
merge non-Plan9-specific stuff from the branch, add KNF, etc.
2006-08-24 22:32:53 +02:00
#else
return (0);
#endif
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case TO_FILGZ: /* -s */
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
return (stat(opnd1, &b1) == 0 && b1.st_size > 0L);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case TO_FILTT: /* -t */
Possible fix for Coverity CID#7: convert options() prototype to unsigned (size_t, in fact), and make an explicitly casted (size_t)-1 the error return code, modelled after what is often used in Unix libraries
2007-05-13 20:33:29 +02:00
if (opnd1 && !bi_getn(opnd1, &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
te->flags |= TEF_ERROR;
Possible fix for Coverity CID#7: convert options() prototype to unsigned (size_t, in fact), and make an explicitly casted (size_t)-1 the error return code, modelled after what is often used in Unix libraries
2007-05-13 20:33:29 +02:00
i = 0;
get rid of special "POSIX"ish mode
2005-07-04 14:27:28 +02:00
} else
Possible fix for Coverity CID#7: convert options() prototype to unsigned (size_t, in fact), and make an explicitly casted (size_t)-1 the error return code, modelled after what is often used in Unix libraries
2007-05-13 20:33:29 +02:00
i = isatty(opnd1 ? i : 0);
return (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
case TO_FILUID: /* -O */
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
return (stat(opnd1, &b1) == 0 && b1.st_uid == ksheuid);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case TO_FILGID: /* -G */
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
return (stat(opnd1, &b1) == 0 && b1.st_gid == getegid());
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
/*
* Binary Operators
*/
case TO_STEQL: /* = */
if (te->flags & TEF_DBRACKET)
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
return (gmatchx(opnd1, opnd2, false));
return (strcmp(opnd1, opnd2) == 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
case TO_STNEQ: /* != */
if (te->flags & TEF_DBRACKET)
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
return (!gmatchx(opnd1, opnd2, false));
return (strcmp(opnd1, opnd2) != 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
case TO_STLT: /* < */
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
return (strcmp(opnd1, opnd2) < 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
case TO_STGT: /* > */
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
return (strcmp(opnd1, opnd2) > 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
case TO_INTEQ: /* -eq */
case TO_INTNE: /* -ne */
case TO_INTGE: /* -ge */
case TO_INTGT: /* -gt */
case TO_INTLE: /* -le */
case TO_INTLT: /* -lt */
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
if (!evaluate(opnd1, &v1, KSH_RETURN_ERROR, false) ||
!evaluate(opnd2, &v2, KSH_RETURN_ERROR, false)) {
/* error already printed.. */
te->flags |= TEF_ERROR;
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
switch ((int)op) {
case TO_INTEQ:
return (v1 == v2);
case TO_INTNE:
return (v1 != v2);
case TO_INTGE:
return (v1 >= v2);
case TO_INTGT:
return (v1 > v2);
case TO_INTLE:
return (v1 <= v2);
case TO_INTLT:
return (v1 < v2);
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 more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
case TO_FILNT: /* -nt */
/* ksh88/ksh93 succeed if file2 can't be stated
* (subtly different from 'does not exist').
*/
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
return (stat(opnd1, &b1) == 0 &&
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
(((s = stat(opnd2, &b2)) == 0 &&
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
b1.st_mtime > b2.st_mtime) || s < 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
case TO_FILOT: /* -ot */
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
/* ksh88/ksh93 succeed if file1 can't be stated
* (subtly different from 'does not exist').
*/
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
return (stat(opnd2, &b2) == 0 &&
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
(((s = stat(opnd1, &b1)) == 0 &&
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
b1.st_mtime < b2.st_mtime) || s < 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
case TO_FILEQ: /* -ef */
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
return (stat (opnd1, &b1) == 0 && stat (opnd2, &b2) == 0 &&
b1.st_dev == b2.st_dev && b1.st_ino == b2.st_ino);
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
}
(*te->error)(te, 0, "internal error: unknown op");
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
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
remove Korn's bizarre /dev/fd hack (only affects Interix!) Tests on /dev/fd are now officially unsupported in mksh too.
2005-07-06 02:02:06 +02:00
/* On most/all unixen, access() says everything is executable for root... */
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
static int
test_eaccess(const char *pathl, int mode)
{
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int rv;
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 more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
if ((rv = access(pathl, mode)) == 0 && ksheuid == 0 && (mode & X_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
struct stat statb;
if (stat(pathl, &statb) < 0)
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
rv = -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
else if (S_ISDIR(statb.st_mode))
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
rv = 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
else
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
rv = (statb.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)) ?
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
0 : -1;
}
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
return (rv);
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
test_parse(Test_env *te)
{
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int rv;
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 more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
rv = test_oexpr(te, 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
if (!(te->flags & TEF_ERROR) && !(*te->isa)(te, TM_END))
(*te->error)(te, 0, "unexpected operator/operand");
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
return ((te->flags & TEF_ERROR) ? T_ERR_EXIT : !rv);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
static int
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
test_oexpr(Test_env *te, bool do_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
{
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int rv;
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 more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
if ((rv = test_aexpr(te, do_eval)))
do_eval = false;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (!(te->flags & TEF_ERROR) && (*te->isa)(te, TM_OR))
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
return (test_oexpr(te, do_eval) || rv);
return (rv);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
static int
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
test_aexpr(Test_env *te, bool do_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
{
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int rv;
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 more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
if (!(rv = test_nexpr(te, do_eval)))
do_eval = false;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (!(te->flags & TEF_ERROR) && (*te->isa)(te, TM_AND))
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
return (test_aexpr(te, do_eval) && rv);
return (rv);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
static int
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
test_nexpr(Test_env *te, bool do_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
{
if (!(te->flags & TEF_ERROR) && (*te->isa)(te, TM_NOT))
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
return (!test_nexpr(te, do_eval));
return (test_primary(te, do_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
}
static int
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
test_primary(Test_env *te, bool do_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
{
const char *opnd1, *opnd2;
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int rv;
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
Test_op op;
if (te->flags & TEF_ERROR)
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
return (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
if ((*te->isa)(te, TM_OPAREN)) {
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
rv = test_oexpr(te, do_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
if (te->flags & TEF_ERROR)
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
return (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
if (!(*te->isa)(te, TM_CPAREN)) {
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
(*te->error)(te, 0, "missing )");
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
return (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
}
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
return (rv);
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
}
Revision 1.18: [7]download - view: [8]text, [9]markup, [10]annotated - [11]select for diffs Sun Mar 1 20:11:06 2009 UTC (2 weeks, 6 days ago) by otto Branches: [12]MAIN CVS tags: [13]HEAD Diff to: previous 1.17: [14]preferred, [15]coloured Changes since revision 1.17: +17 -9 lines Fix PR #[16]723: [17]test(1) operator precedence inconsistent with POSIX Make sure ksh builtin test and [18]test(1) do not differ. From Christiano Farina Haesbaert. ok miod@
2009-03-22 18:58:58 +01:00
/*
* Binary should have precedence over unary in this case
* so that something like test \( -f = -f \) is accepted
*/
if ((te->flags & TEF_DBRACKET) || (&te->pos.wp[1] < te->wp_end &&
sync; fold oksh-seterror test into errexit-*; use print not printf
2009-03-22 19:28:35 +01:00
!test_isop(TM_BINOP, te->pos.wp[1]))) {
Revision 1.18: [7]download - view: [8]text, [9]markup, [10]annotated - [11]select for diffs Sun Mar 1 20:11:06 2009 UTC (2 weeks, 6 days ago) by otto Branches: [12]MAIN CVS tags: [13]HEAD Diff to: previous 1.17: [14]preferred, [15]coloured Changes since revision 1.17: +17 -9 lines Fix PR #[16]723: [17]test(1) operator precedence inconsistent with POSIX Make sure ksh builtin test and [18]test(1) do not differ. From Christiano Farina Haesbaert. ok miod@
2009-03-22 18:58:58 +01:00
if ((op = (*te->isa)(te, TM_UNOP))) {
/* unary expression */
opnd1 = (*te->getopnd)(te, op, do_eval);
if (!opnd1) {
(*te->error)(te, -1, "missing argument");
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
return (0);
Revision 1.18: [7]download - view: [8]text, [9]markup, [10]annotated - [11]select for diffs Sun Mar 1 20:11:06 2009 UTC (2 weeks, 6 days ago) by otto Branches: [12]MAIN CVS tags: [13]HEAD Diff to: previous 1.17: [14]preferred, [15]coloured Changes since revision 1.17: +17 -9 lines Fix PR #[16]723: [17]test(1) operator precedence inconsistent with POSIX Make sure ksh builtin test and [18]test(1) do not differ. From Christiano Farina Haesbaert. ok miod@
2009-03-22 18:58:58 +01: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 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
return ((*te->eval)(te, op, opnd1, NULL, do_eval));
Revision 1.18: [7]download - view: [8]text, [9]markup, [10]annotated - [11]select for diffs Sun Mar 1 20:11:06 2009 UTC (2 weeks, 6 days ago) by otto Branches: [12]MAIN CVS tags: [13]HEAD Diff to: previous 1.17: [14]preferred, [15]coloured Changes since revision 1.17: +17 -9 lines Fix PR #[16]723: [17]test(1) operator precedence inconsistent with POSIX Make sure ksh builtin test and [18]test(1) do not differ. From Christiano Farina Haesbaert. ok miod@
2009-03-22 18:58:58 +01: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
}
opnd1 = (*te->getopnd)(te, TO_NONOP, do_eval);
if (!opnd1) {
(*te->error)(te, 0, "expression expected");
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
return (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
}
revert wrong fix
2008-03-28 19:46:59 +01:00
if ((op = (*te->isa)(te, TM_BINOP))) {
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
/* binary expression */
opnd2 = (*te->getopnd)(te, op, do_eval);
if (!opnd2) {
(*te->error)(te, -1, "missing second argument");
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
return (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
}
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
return ((*te->eval)(te, op, opnd1, opnd2, do_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
}
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
return ((*te->eval)(te, TO_STNZE, opnd1, NULL, do_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
}
/*
* Plain test (test and [ .. ]) specific routines.
*/
• 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 if the current token is a whatever. Accepts the current token if
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
* it is. Returns 0 if it is not, non-zero if it is (in the case 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
* TM_UNOP and TM_BINOP, the returned value is a Test_op).
*/
• 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
static Test_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
ptest_isa(Test_env *te, Test_meta meta)
{
/* Order important - indexed by Test_meta values */
static const char *const tokens[] = {
"-o", "-a", "!", "(", ")"
};
• 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 rv;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (te->pos.wp >= te->wp_end)
• 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
return (meta == TM_END ? 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
if (meta == TM_UNOP || meta == TM_BINOP)
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
rv = test_isop(meta, *te->pos.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
else if (meta == TM_END)
• 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
rv = 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
else
• 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
rv = !strcmp(*te->pos.wp, tokens[(int)meta]) ?
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
/* Accept the token? */
• 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
if (rv != 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
te->pos.wp++;
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
return (rv);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
static 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
ptest_getopnd(Test_env *te, Test_op op, bool do_eval MKSH_A_UNUSED)
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
{
if (te->pos.wp >= te->wp_end)
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
return (op == TO_FILTT ? "1" : NULL);
return (*te->pos.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
}
static void
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
ptest_error(Test_env *te, int ofs, const char *msg)
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 more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
const char *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
te->flags |= TEF_ERROR;
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
if ((op = te->pos.wp + ofs >= te->wp_end ? NULL : te->pos.wp[ofs]))
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
bi_errorf("%s: %s", op, msg);
else
bi_errorf("%s", msg);
}
Add MKSH_NO_LIMITS, to define which has the same effect as the absence of RLIM_INFINITY, namely make c_ulimit() into a true
2009-06-08 22:52:28 +02:00
#ifndef MKSH_NO_LIMITS
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 SOFT 0x1
#define HARD 0x2
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
struct limits {
const char *name;
int resource; /* resource to get/set */
int factor; /* multiply by to get rlim_{cur,max} values */
char option;
};
take most of the goodies of the recent c_ulimit() changes, but retain the old way of working (also add some more casts and simplify the code)
2008-04-22 20:58:20 +02:00
static void print_ulimit(const struct limits *, int);
static int set_ulimit(const struct limits *, const char *, int);
rework ‘m’ and ‘v’ ulimits; add more (seen at zsh)
2010-03-27 17:51:39 +01:00
/* Magic to divine the 'm' and 'v' limits */
#ifdef RLIMIT_AS
#if !defined(RLIMIT_VMEM) || (RLIMIT_VMEM == RLIMIT_AS) || \
!defined(RLIMIT_RSS) || (RLIMIT_VMEM == RLIMIT_RSS)
#define ULIMIT_V_IS_AS
#elif defined(RLIMIT_VMEM)
#if !defined(RLIMIT_RSS) || (RLIMIT_RSS == RLIMIT_AS)
#define ULIMIT_V_IS_AS
#else
#define ULIMIT_V_IS_VMEM
#endif
#endif
#endif
#ifdef RLIMIT_RSS
#ifdef ULIMIT_V_IS_VMEM
#define ULIMIT_M_IS_RSS
#elif defined(RLIMIT_VMEM) && (RLIMIT_VMEM == RLIMIT_RSS)
#define ULIMIT_M_IS_VMEM
#else
#define ULIMIT_M_IS_RSS
#endif
#if defined(ULIMIT_M_IS_RSS) && defined(RLIMIT_AS) && (RLIMIT_RSS == RLIMIT_AS)
#undef ULIMIT_M_IS_RSS
#endif
#endif
#if !defined(RLIMIT_AS) && !defined(ULIMIT_M_IS_VMEM) && defined(RLIMIT_VMEM)
#define ULIMIT_V_IS_VMEM
#endif
#if !defined(ULIMIT_V_IS_VMEM) && defined(RLIMIT_VMEM) && \
(!defined(RLIMIT_RSS) || (defined(RLIMIT_AS) && (RLIMIT_RSS == RLIMIT_AS)))
#define ULIMIT_M_IS_VMEM
#endif
#if defined(ULIMIT_M_IS_VMEM) && defined(RLIMIT_AS) && \
(RLIMIT_VMEM == RLIMIT_AS)
#undef ULIMIT_M_IS_VMEM
#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
int
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
c_ulimit(const 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
{
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
static const struct limits limits[] = {
/* do not use options -H, -S or -a or change the order */
#ifdef RLIMIT_CPU
{ "time(cpu-seconds)", RLIMIT_CPU, 1, 't' },
#endif
#ifdef RLIMIT_FSIZE
{ "file(blocks)", RLIMIT_FSIZE, 512, 'f' },
#endif
* add RLIMIT_LOCKS from Debian pdksh diff * unify ifdef and spacing of all RLIMITs
2005-05-25 11:18:16 +02:00
#ifdef RLIMIT_CORE
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
{ "coredump(blocks)", RLIMIT_CORE, 512, 'c' },
* add RLIMIT_LOCKS from Debian pdksh diff * unify ifdef and spacing of all RLIMITs
2005-05-25 11:18:16 +02:00
#endif
#ifdef RLIMIT_DATA
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
{ "data(KiB)", RLIMIT_DATA, 1024, 'd' },
* add RLIMIT_LOCKS from Debian pdksh diff * unify ifdef and spacing of all RLIMITs
2005-05-25 11:18:16 +02:00
#endif
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
#ifdef RLIMIT_STACK
{ "stack(KiB)", RLIMIT_STACK, 1024, 's' },
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
#endif
missing preprocessor defines on Solaris
2005-05-23 17:24:43 +02:00
#ifdef RLIMIT_MEMLOCK
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
{ "lockedmem(KiB)", RLIMIT_MEMLOCK, 1024, 'l' },
missing preprocessor defines on Solaris
2005-05-23 17:24:43 +02:00
#endif
* add RLIMIT_LOCKS from Debian pdksh diff * unify ifdef and spacing of all RLIMITs
2005-05-25 11:18:16 +02:00
#ifdef RLIMIT_NOFILE
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
{ "nofiles(descriptors)", RLIMIT_NOFILE, 1, 'n' },
* add RLIMIT_LOCKS from Debian pdksh diff * unify ifdef and spacing of all RLIMITs
2005-05-25 11:18:16 +02:00
#endif
missing preprocessor defines on Solaris
2005-05-23 17:24:43 +02:00
#ifdef RLIMIT_NPROC
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
{ "processes", RLIMIT_NPROC, 1, 'p' },
* fix emacs [ tabcompletion bug XXX it's probably a bug in vi mode too, it just doesn't show * bring manual page and reality into closer sync'd state * sort ulimits
2005-05-26 01:31:08 +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
#ifdef RLIMIT_SWAP
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
{ "swap(KiB)", RLIMIT_SWAP, 1024, 'w' },
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
#endif
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
#ifdef RLIMIT_LOCKS
{ "flocks", RLIMIT_LOCKS, -1, 'L' },
#endif
#ifdef RLIMIT_TIME
{ "humantime(seconds)", RLIMIT_TIME, 1, 'T' },
even better on Haiku: * let ulimits work * add a Haiku-specific ulimit * always use UTF-8, they have no locales but a UTF-8 terminal
2010-03-14 12:58:33 +01:00
#endif
#ifdef RLIMIT_NOVMON
{ "vnodemonitors", RLIMIT_NOVMON, 1, 'V' },
rework ‘m’ and ‘v’ ulimits; add more (seen at zsh)
2010-03-27 17:51:39 +01:00
#endif
#ifdef RLIMIT_SIGPENDING
{ "sigpending", RLIMIT_SIGPENDING, 1, 'i' },
#endif
#ifdef RLIMIT_MSGQUEUE
{ "msgqueue(bytes)", RLIMIT_MSGQUEUE, 1, 'q' },
#endif
#ifdef RLIMIT_AIO_MEM
{ "AIOlockedmem(KiB)", RLIMIT_AIO_MEM, 1024, 'M' },
#endif
#ifdef RLIMIT_AIO_OPS
{ "AIOoperations", RLIMIT_AIO_OPS, 1, 'O' },
#endif
#ifdef RLIMIT_TCACHE
{ "cachedthreads", RLIMIT_TCACHE, 1, 'C' },
#endif
#ifdef RLIMIT_SBSIZE
{ "sockbufsiz(KiB)", RLIMIT_SBSIZE, 1024, 'B' },
#endif
#ifdef RLIMIT_PTHREAD
{ "threadsperprocess", RLIMIT_PTHREAD, 1, 'P' },
#endif
#ifdef RLIMIT_NICE
{ "maxnice", RLIMIT_NICE, 1, 'e' },
#endif
#ifdef RLIMIT_RTPRIO
{ "maxrtprio", RLIMIT_RTPRIO, 1, 'r' },
#endif
#if defined(ULIMIT_M_IS_RSS)
{ "resident-set(KiB)", RLIMIT_RSS, 1024, 'm' },
#elif defined(ULIMIT_M_IS_VMEM)
{ "memory(KiB)", RLIMIT_VMEM, 1024, 'm' },
#endif
#if defined(ULIMIT_V_IS_VMEM)
{ "virtual-memory(KiB)", RLIMIT_VMEM, 1024, 'v' },
#elif defined(ULIMIT_V_IS_AS)
{ "address-space(KiB)", RLIMIT_AS, 1024, 'v' },
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
#endif
{ NULL, 0, 0, 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
};
• revert the oksh code to be able to set multiple ulimits in one invocation, until it works with a common idiom: “ulimit -dS 262144” (but keep some goodies) • add a regression test for that
2008-04-20 23:30:29 +02:00
static char opts[3 + NELEM(limits)];
take most of the goodies of the recent c_ulimit() changes, but retain the old way of working (also add some more casts and simplify the code)
2008-04-22 20:58:20 +02:00
int how = SOFT | HARD, optc, what = 'f';
bool all = false;
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
const struct limits *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
if (!opts[0]) {
/* build options string on first call - yuck */
char *p = opts;
*p++ = 'H'; *p++ = 'S'; *p++ = 'a';
• revert the oksh code to be able to set multiple ulimits in one invocation, until it works with a common idiom: “ulimit -dS 262144” (but keep some goodies) • add a regression test for that
2008-04-20 23:30:29 +02:00
for (l = limits; l->name; 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
*p++ = l->option;
*p = '\0';
}
take most of the goodies of the recent c_ulimit() changes, but retain the old way of working (also add some more casts and simplify the code)
2008-04-22 20:58:20 +02:00
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
while ((optc = ksh_getopt(wp, &builtin_opt, opts)) != -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
switch (optc) {
case 'H':
how = HARD;
break;
case 'S':
how = SOFT;
break;
case 'a':
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
all = true;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case '?':
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s: %s", "usage",
"ulimit [-acdfHLlmnpSsTtvw] [value]");
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
default:
• revert the oksh code to be able to set multiple ulimits in one invocation, until it works with a common idiom: “ulimit -dS 262144” (but keep some goodies) • add a regression test for that
2008-04-20 23:30:29 +02:00
what = optc;
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
}
• revert the oksh code to be able to set multiple ulimits in one invocation, until it works with a common idiom: “ulimit -dS 262144” (but keep some goodies) • add a regression test for that
2008-04-20 23:30:29 +02:00
for (l = limits; l->name && l->option != what; l++)
;
if (!l->name) {
internal_warningf("ulimit: %c", what);
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
take most of the goodies of the recent c_ulimit() changes, but retain the old way of working (also add some more casts and simplify the code)
2008-04-22 20:58:20 +02:00
if (wp[builtin_opt.optind]) {
if (all || wp[builtin_opt.optind + 1]) {
• revert the oksh code to be able to set multiple ulimits in one invocation, until it works with a common idiom: “ulimit -dS 262144” (but keep some goodies) • add a regression test for that
2008-04-20 23:30:29 +02:00
bi_errorf("too many arguments");
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
return (1);
• revert the oksh code to be able to set multiple ulimits in one invocation, until it works with a common idiom: “ulimit -dS 262144” (but keep some goodies) • add a regression test for that
2008-04-20 23:30:29 +02:00
}
take most of the goodies of the recent c_ulimit() changes, but retain the old way of working (also add some more casts and simplify the code)
2008-04-22 20:58:20 +02:00
return (set_ulimit(l, wp[builtin_opt.optind], how));
• revert the oksh code to be able to set multiple ulimits in one invocation, until it works with a common idiom: “ulimit -dS 262144” (but keep some goodies) • add a regression test for that
2008-04-20 23:30:29 +02:00
}
take most of the goodies of the recent c_ulimit() changes, but retain the old way of working (also add some more casts and simplify the code)
2008-04-22 20:58:20 +02:00
if (!all)
print_ulimit(l, how);
else for (l = limits; l->name; l++) {
shprintf("%-20s ", l->name);
print_ulimit(l, how);
}
return (0);
}
static int
set_ulimit(const struct limits *l, const char *v, int how)
{
rlim_t val = (rlim_t)0;
struct rlimit limit;
if (strcmp(v, "unlimited") == 0)
val = (rlim_t)RLIM_INFINITY;
else {
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
mksh_ari_t rval;
take most of the goodies of the recent c_ulimit() changes, but retain the old way of working (also add some more casts and simplify the code)
2008-04-22 20:58:20 +02:00
if (!evaluate(v, &rval, KSH_RETURN_ERROR, false))
return (1);
/*
* Avoid problems caused by typos that evaluate misses due
* to evaluating unset parameters to 0...
* If this causes problems, will have to add parameter to
* evaluate() to control if unset params are 0 or an error.
*/
if (!rval && !ksh_isdigit(v[0])) {
bi_errorf("invalid %s limit: %s", l->name, v);
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
take most of the goodies of the recent c_ulimit() changes, but retain the old way of working (also add some more casts and simplify the code)
2008-04-22 20:58:20 +02:00
val = (rlim_t)((rlim_t)rval * l->factor);
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
}
take most of the goodies of the recent c_ulimit() changes, but retain the old way of working (also add some more casts and simplify the code)
2008-04-22 20:58:20 +02:00
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
if (getrlimit(l->resource, &limit) < 0) {
shave off another 468 bytes: we’re 300 bytes smaller than BEFORE the cat builtin was added now… (also removed utf-8 from source files, in favour of just ASCII)
2010-08-28 22:22:24 +02:00
/* some can't be read, e.g. Linux RLIMIT_LOCKS */
_careful_ (feature) sync with oksh: (3 weeks, 5 days ago) by millert Make ulimit able to get and set multiple limits in a single invocation like bash and zsh do. Requested by espie@, OK deraadt@
2008-04-16 23:56:03 +02:00
limit.rlim_cur = RLIM_INFINITY;
limit.rlim_max = RLIM_INFINITY;
}
if (how & SOFT)
limit.rlim_cur = val;
if (how & HARD)
limit.rlim_max = val;
take most of the goodies of the recent c_ulimit() changes, but retain the old way of working (also add some more casts and simplify the code)
2008-04-22 20:58:20 +02:00
if (!setrlimit(l->resource, &limit))
return (0);
if (errno == EPERM)
bi_errorf("%s exceeds allowable %s limit", v, l->name);
else
bi_errorf("bad %s limit: %s", l->name, strerror(errno));
return (1);
}
static void
print_ulimit(const struct limits *l, int how)
{
rlim_t val = (rlim_t)0;
struct rlimit limit;
if (getrlimit(l->resource, &limit)) {
shf_puts("unknown\n", shl_stdout);
return;
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
}
take most of the goodies of the recent c_ulimit() changes, but retain the old way of working (also add some more casts and simplify the code)
2008-04-22 20:58:20 +02:00
if (how & SOFT)
val = limit.rlim_cur;
else if (how & HARD)
val = limit.rlim_max;
explicit cast, since Bionic headers aren’t type safe, apparently
2009-12-01 14:12:30 +01:00
if (val == (rlim_t)RLIM_INFINITY)
take most of the goodies of the recent c_ulimit() changes, but retain the old way of working (also add some more casts and simplify the code)
2008-04-22 20:58:20 +02:00
shf_puts("unlimited\n", shl_stdout);
else
shprintf("%ld\n", (long)(val / l->factor));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
make {get,set}rlimit code depend on RLIM_INFINITY existence (PW32, Minix 3)
2009-04-03 11:45:23 +02:00
#endif
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 **wp)
{
int rv = 1;
optimise error messages, option parsing, and make more builtins recognise "--", costs us 20 .text 0 .data 0 .bss
2010-09-05 21:51:35 +02:00
/* skip argv[0] */
++wp;
if (wp[0] && !strcmp(wp[0], "--"))
/* skip "--" (options separator) */
++wp;
/* check for exactly two arguments */
if (wp[0] == NULL /* first argument */ ||
wp[1] == NULL /* second argument */ ||
wp[2] != NULL /* no further args please */)
employ string pooling techniques to save off a few more bytes (probably more than the new “rename” builtin ever required…)
2007-08-20 01:12:23 +02:00
bi_errorf(T_synerr);
optimise error messages, option parsing, and make more builtins recognise "--", costs us 20 .text 0 .data 0 .bss
2010-09-05 21:51:35 +02:00
else if ((rv = rename(wp[0], wp[1])) != 0) {
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
rv = errno;
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
bi_errorf("%s: %s", "failed", strerror(rv));
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
}
return (rv);
}
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 **wp)
{
int rv = 1;
add a do_realpath() implementation replacing the use of the external libc function realpath(3) which may not be available on the target system; compile the realpath builtin unconditionally looks fine to me, but review is appreciated; this is (very) lightly based upon MirBSD libc’s realpath(3) and pdksh’s get_phys_path()
2009-08-30 15:22:39 +02:00
char *buf;
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
optimise error messages, option parsing, and make more builtins recognise "--", costs us 20 .text 0 .data 0 .bss
2010-09-05 21:51:35 +02:00
/* skip argv[0] */
++wp;
if (wp[0] && !strcmp(wp[0], "--"))
/* skip "--" (options separator) */
++wp;
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
optimise error messages, option parsing, and make more builtins recognise "--", costs us 20 .text 0 .data 0 .bss
2010-09-05 21:51:35 +02:00
/* check for exactly one argument */
if (wp[0] == NULL || wp[1] != NULL)
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
bi_errorf(T_synerr);
optimise error messages, option parsing, and make more builtins recognise "--", costs us 20 .text 0 .data 0 .bss
2010-09-05 21:51:35 +02:00
else if ((buf = do_realpath(wp[0])) == NULL) {
add a do_realpath() implementation replacing the use of the external libc function realpath(3) which may not be available on the target system; compile the realpath builtin unconditionally looks fine to me, but review is appreciated; this is (very) lightly based upon MirBSD libc’s realpath(3) and pdksh’s get_phys_path()
2009-08-30 15:22:39 +02:00
rv = errno;
optimise error messages, option parsing, and make more builtins recognise "--", costs us 20 .text 0 .data 0 .bss
2010-09-05 21:51:35 +02:00
bi_errorf("%s: %s", wp[0], strerror(rv));
add a do_realpath() implementation replacing the use of the external libc function realpath(3) which may not be available on the target system; compile the realpath builtin unconditionally looks fine to me, but review is appreciated; this is (very) lightly based upon MirBSD libc’s realpath(3) and pdksh’s get_phys_path()
2009-08-30 15:22:39 +02:00
if ((unsigned int)rv > 255)
rv = 255;
} else {
shprintf("%s\n", buf);
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
afree(buf, ATEMP);
optimise error messages, option parsing, and make more builtins recognise "--", costs us 20 .text 0 .data 0 .bss
2010-09-05 21:51:35 +02:00
rv = 0;
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
}
return (rv);
}
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 **wp)
{
int fd = STDIN_FILENO, rv = 0;
ssize_t n, w;
const char *fn = "<stdin>";
char *buf, *cp;
#define MKSH_CAT_BUFSIZ 4096
/* XXX uses malloc instead of lalloc (for alignment/speed) */
if ((buf = malloc(MKSH_CAT_BUFSIZ)) == NULL) {
shave off another 468 bytes: we’re 300 bytes smaller than BEFORE the cat builtin was added now… (also removed utf-8 from source files, in favour of just ASCII)
2010-08-28 22:22:24 +02:00
bi_errorf("can't allocate %lu data bytes",
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
(unsigned long)MKSH_CAT_BUFSIZ);
return (1);
}
optimise error messages, option parsing, and make more builtins recognise "--", costs us 20 .text 0 .data 0 .bss
2010-09-05 21:51:35 +02:00
/* skip argv[0] */
++wp;
if (wp[0] && !strcmp(wp[0], "--"))
/* skip "--" (options separator) */
++wp;
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
do {
if (*wp) {
fn = *wp++;
if (fn[0] == '-' && fn[1] == '\0')
fd = STDIN_FILENO;
else if ((fd = open(fn, O_RDONLY)) < 0) {
rv = errno;
bi_errorf("%s: %s", fn, strerror(rv));
rv = 1;
continue;
}
}
while (1) {
n = blocking_read(fd, (cp = buf), MKSH_CAT_BUFSIZ);
if (n == -1) {
if (errno == EINTR)
/* interrupted, try again */
continue;
/* an error occured during reading */
rv = errno;
bi_errorf("%s: %s", fn, strerror(rv));
rv = 1;
break;
} else if (n == 0)
/* end of file reached */
break;
while (n) {
w = write(STDOUT_FILENO, cp, n);
if (w == -1) {
if (errno == EINTR)
/* interrupted, try again */
continue;
/* an error occured during writing */
rv = errno;
bi_errorf("%s: %s", "<stdout>",
strerror(rv));
rv = 1;
if (fd != STDIN_FILENO)
close(fd);
goto out;
}
n -= w;
cp += w;
}
}
if (fd != STDIN_FILENO)
close(fd);
} while (*wp);
out:
free(buf);
return (rv);
}