#include "sh.h"
-__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.137.2.4 2015/04/19 19:18:15 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.160 2015/07/10 19:36:35 tg Exp $");
#ifndef MKSH_DEFAULT_EXECSHELL
-#define MKSH_DEFAULT_EXECSHELL "/bin/sh"
+#define MKSH_DEFAULT_EXECSHELL MKSH_UNIXROOT "/bin/sh"
#endif
static int comexec(struct op *, struct tbl * volatile, const char **,
static void dbteste_error(Test_env *, int, const char *);
static int search_access(const char *, int);
/* XXX: horrible kludge to fit within the framework */
-static char *plain_fmt_entry(char *, size_t, unsigned int, const void *);
-static char *select_fmt_entry(char *, size_t, unsigned int, const void *);
+static void plain_fmt_entry(char *, size_t, unsigned int, const void *);
+static void select_fmt_entry(char *, size_t, unsigned int, const void *);
/*
* execute command tree
}
if ((tp = findcom(cp, FC_BI)) == NULL)
errorf("%s: %s: %s", Tbuiltin, cp, "not a builtin");
+ if (tp->type == CSHELL && (tp->val.f == c_cat
+#ifdef MKSH_PRINTF_BUILTIN
+ || tp->val.f == c_printf
+#endif
+ ))
+ break;
continue;
} else if (tp->val.f == c_exec) {
if (ap[1] == NULL)
subst_exstat = 0;
break;
}
-#ifndef MKSH_NO_EXTERNAL_CAT
} else if (tp->val.f == c_cat) {
- /*
- * if we have any flags, do not use the builtin
- * in theory, we could allow -u, but that would
- * mean to use ksh_getopt here and possibly ad-
- * ded complexity and more code and isn't worth
- * additional hassle (and the builtin must call
- * ksh_getopt already but can't come back here)
- */
+ /* if we have any flags, do not use the builtin */
if (ap[1] && ap[1][0] == '-' && ap[1][1] != '\0' &&
/* argument, begins with -, is not - or -- */
- (ap[1][1] != '-' || ap[1][2] != '\0'))
- /* don't look for builtins or functions */
- fcflags = FC_PATH;
- else
- /* go on, use the builtin */
- break;
+ (ap[1][1] != '-' || ap[1][2] != '\0')) {
+ struct tbl *ext_cat;
+
+ ext_cat = findcom(Tcat, FC_PATH | FC_FUNC);
+ if (ext_cat && (ext_cat->type != CTALIAS ||
+ (ext_cat->flag & ISSET)))
+ tp = ext_cat;
+ }
+ break;
+#ifdef MKSH_PRINTF_BUILTIN
+ } else if (tp->val.f == c_printf) {
+ struct tbl *ext_printf;
+
+ ext_printf = findcom(Tprintf, FC_PATH | FC_FUNC);
+ if (ext_printf && (ext_printf->type != CTALIAS ||
+ (ext_printf->flag & ISSET)))
+ tp = ext_printf;
+ break;
#endif
} else if (tp->val.f == c_trap) {
t->u.evalflags &= ~DOTCOMEXEC;
/* shell built-in */
case CSHELL:
+ do_call_builtin:
rv = call_builtin(tp, (const char **)ap, null, resetspec);
if (resetspec && tp->val.f == c_shift) {
l_expand->argc = l_assign->argc;
/* function call */
case CFUNC: {
- volatile unsigned char old_xflag;
volatile uint32_t old_inuse;
const char * volatile old_kshname;
+ volatile uint8_t old_flags[FNFLAGS];
if (!(tp->flag & ISSET)) {
struct tbl *ftp;
break;
}
if (include(tp->u.fpath, 0, NULL, false) < 0) {
+ if (!strcmp(cp, Tcat)) {
+ no_cat_in_FPATH:
+ tp = findcom(Tcat, FC_BI);
+ goto do_call_builtin;
+ }
+#ifdef MKSH_PRINTF_BUILTIN
+ if (!strcmp(cp, Tprintf)) {
+ no_printf_in_FPATH:
+ tp = findcom(Tprintf, FC_BI);
+ goto do_call_builtin;
+ }
+#endif
warningf(true, "%s: %s %s %s: %s", cp,
"can't open", "function definition file",
tp->u.fpath, cstrerror(errno));
}
if (!(ftp = findfunc(cp, hash(cp), false)) ||
!(ftp->flag & ISSET)) {
+ if (!strcmp(cp, Tcat))
+ goto no_cat_in_FPATH;
+#ifdef MKSH_PRINTF_BUILTIN
+ if (!strcmp(cp, Tprintf))
+ goto no_printf_in_FPATH;
+#endif
warningf(true, "%s: %s %s", cp,
"function not defined by", tp->u.fpath);
rv = 127;
getopts_reset(1);
}
- old_xflag = Flag(FXTRACE) ? 1 : 0;
- change_xtrace((Flag(FXTRACEREC) ? old_xflag : 0) |
+ for (type_flags = 0; type_flags < FNFLAGS; ++type_flags)
+ old_flags[type_flags] = shell_flags[type_flags];
+ change_xtrace((Flag(FXTRACEREC) ? Flag(FXTRACE) : 0) |
((tp->flag & TRACE) ? 1 : 0), false);
old_inuse = tp->flag & FINUSE;
tp->flag |= FINUSE;
}
kshname = old_kshname;
- change_xtrace(old_xflag, false);
+ change_xtrace(old_flags[(int)FXTRACE], false);
+#ifndef MKSH_LEGACY_MODE
+ if (tp->flag & FKSH) {
+ /* Korn style functions restore Flags on return */
+ old_flags[(int)FXTRACE] = Flag(FXTRACE);
+ for (type_flags = 0; type_flags < FNFLAGS; ++type_flags)
+ shell_flags[type_flags] = old_flags[type_flags];
+ }
+#endif
tp->flag = (tp->flag & ~FINUSE) | old_inuse;
/*
*tp->args-- = tp->str;
#ifndef MKSH_SMALL
- if ((fd = open(tp->str, O_RDONLY | O_BINARY)) >= 0) {
+ if ((fd = binopen2(tp->str, O_RDONLY)) >= 0) {
unsigned char *cp;
unsigned short m;
ssize_t n;
/* restore begin of shebang position (buf+0 or buf+3) */
cp = buf + n;
/* bail out if no shebang magic found */
- if ((cp[0] != '#') || (cp[1] != '!'))
+ if (cp[0] == '#' && cp[1] == '!')
+ cp += 2;
+#ifdef __OS2__
+ else if (!strncmp(cp, Textproc, 7) &&
+ (cp[7] == ' ' || cp[7] == '\t'))
+ cp += 8;
+#endif
+ else
goto noshebang;
-
- cp += 2;
/* skip whitespace before shell name */
while (*cp == ' ' || *cp == '\t')
++cp;
(m == /* ECOFF_I386 */ 0x4C01) ||
(m == /* ECOFF_M68K */ 0x0150 || m == 0x5001) ||
(m == /* ECOFF_SH */ 0x0500 || m == 0x0005) ||
- (m == /* "MZ" */ 0x4D5A) ||
+ (m == /* bzip */ 0x425A) || (m == /* "MZ" */ 0x4D5A) ||
+ (m == /* "NE" */ 0x4E45) || (m == /* "LX" */ 0x4C58) ||
+ (m == /* xz */ 0xFD37 && buf[2] == 'z' && buf[3] == 'X' &&
+ buf[4] == 'Z') || (m == /* 7zip */ 0x377A) ||
(m == /* gzip */ 0x1F8B) || (m == /* .Z */ 0x1F9D))
errorf("%s: not executable: magic %04X", tp->str, m);
nomagic:
nhash = hash(name);
+#ifdef MKSH_LEGACY_MODE
if (t != NULL && !tobool(t->u.ksh_func)) {
/* drop same-name aliases for POSIX functions */
if ((tp = ktsearch(&aliases, name, nhash)))
ktdelete(tp);
}
+#endif
while (/* CONSTCOND */ 1) {
tp = findfunc(name, nhash, true);
struct tstate ts;
for (ktwalk(&ts, &taliases); (tp = ktnext(&ts)) != NULL; )
- if ((tp->flag&ISSET) && (all || tp->val.s[0] != '/')) {
+ if ((tp->flag&ISSET) && (all || !mksh_abspath(tp->val.s))) {
if (tp->flag&ALLOC) {
tp->flag &= ~(ALLOC|ISSET);
afree(tp->val.s, APERM);
sp = lpath;
while (sp != NULL) {
xp = Xstring(xs, xp);
- if (!(p = cstrchr(sp, ':')))
+ if (!(p = cstrchr(sp, MKSH_PATHSEPC)))
p = sp + strlen(sp);
if (p != sp) {
XcheckN(xs, xp, p - sp);
const char *emsg;
do_open = false;
- if (*cp == '-' && !cp[1]) {
+ if (ksh_isdash(cp)) {
/* prevent error return below */
u = 1009;
do_close = true;
warningf(true, "%s: %s", cp, "restricted");
return (-1);
}
- u = open(cp, flags | O_BINARY, 0666);
+ u = binopen3(cp, flags, 0666);
}
if (u < 0) {
/* herein() may already have printed message */
* so temp doesn't get removed too soon).
*/
h = maketemp(ATEMP, TT_HEREDOC_EXP, &e->temps);
- if (!(shf = h->shf) || (fd = open(h->tffn, O_RDONLY | O_BINARY, 0)) < 0) {
+ if (!(shf = h->shf) || (fd = binopen3(h->tffn, O_RDONLY, 0)) < 0) {
i = errno;
warningf(true, "can't %s temporary file %s: %s",
!shf ? "create" : "open", h->tffn, cstrerror(i));
};
/* format a single select menu item */
-static char *
+static void
select_fmt_entry(char *buf, size_t buflen, unsigned int i, const void *arg)
{
const struct select_menu_info *smi =
shf_snprintf(buf, buflen, "%*u) %s",
smi->num_width, i + 1, smi->args[i]);
- return (buf);
}
/*
true);
}
-static char *
+static void
plain_fmt_entry(char *buf, size_t buflen, unsigned int i, const void *arg)
{
strlcpy(buf, ((const char * const *)arg)[i], buflen);
- return (buf);
}
void
OSDN Git Service
