mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-05-28 08:12:28 +00:00
Embed cocmd.com interpreter for system() / open()
This change lets you use system() in an easier and portable way. The problem with the call in the past has always been that bourne and cmd.com on Windows have less than nothing in common, so pretty much the only command system() could be used for across platforms was maybe echo. cmd.exe is also a security liability due to its escaping rules. Since cocmd.com implements 85% of what we need from bourne, in a really tiny way, it makes perfect sense to be embedded in these functionss. We get a huge performance boost too. Fixes #644
This commit is contained in:
Justine Tunney
parent
daca5499b9
commit
950a1b310b
9 changed files with 313 additions and 320 deletions
270
libc/stdio/cocmd.c
Normal file
270
libc/stdio/cocmd.c
Normal file
|
|
@ -0,0 +1,270 @@
|
|||
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
||||
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
|
||||
╞══════════════════════════════════════════════════════════════════════════════╡
|
||||
│ Copyright 2022 Justine Alexandra Roberts Tunney │
|
||||
│ │
|
||||
│ Permission to use, copy, modify, and/or distribute this software for │
|
||||
│ any purpose with or without fee is hereby granted, provided that the │
|
||||
│ above copyright notice and this permission notice appear in all copies. │
|
||||
│ │
|
||||
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
|
||||
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
|
||||
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
|
||||
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
|
||||
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
|
||||
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
|
||||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/errno.h"
|
||||
#include "libc/fmt/itoa.h"
|
||||
#include "libc/macros.internal.h"
|
||||
#include "libc/mem/mem.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
#include "libc/stdio/stdio.h"
|
||||
#include "libc/str/str.h"
|
||||
#include "libc/sysv/consts/o.h"
|
||||
|
||||
/**
|
||||
* @fileoverview Cosmopolitan Command Interpreter
|
||||
*
|
||||
* This is a lightweight command interpreter for GNU Make. It has just
|
||||
* enough shell script language support to support our build config.
|
||||
*/
|
||||
|
||||
#define STATE_SHELL 0
|
||||
#define STATE_STR 1
|
||||
#define STATE_QUO 2
|
||||
|
||||
char *p;
|
||||
char *q;
|
||||
size_t n;
|
||||
char *cmd;
|
||||
char *args[8192];
|
||||
const char *prog;
|
||||
char argbuf[ARG_MAX];
|
||||
bool unsupported[256];
|
||||
|
||||
void Write(const char *s, ...) {
|
||||
va_list va;
|
||||
va_start(va, s);
|
||||
do {
|
||||
write(2, s, strlen(s));
|
||||
} while ((s = va_arg(va, const char *)));
|
||||
va_end(va);
|
||||
}
|
||||
|
||||
wontreturn void UnsupportedSyntax(unsigned char c) {
|
||||
char cbuf[2];
|
||||
char ibuf[13];
|
||||
cbuf[0] = c;
|
||||
cbuf[1] = 0;
|
||||
FormatOctal32(ibuf, c, true);
|
||||
Write(prog, ": unsupported shell syntax '", cbuf, "' (", ibuf, "): ", cmd,
|
||||
"\n", 0);
|
||||
exit(4);
|
||||
}
|
||||
|
||||
wontreturn void SysExit(int rc, const char *call, const char *thing) {
|
||||
int err;
|
||||
char ibuf[12];
|
||||
const char *estr;
|
||||
err = errno;
|
||||
FormatInt32(ibuf, err);
|
||||
estr = _strerdoc(err);
|
||||
if (!estr) estr = "EUNKNOWN";
|
||||
Write(thing, ": ", call, "() failed: ", estr, " (", ibuf, ")\n", 0);
|
||||
exit(rc);
|
||||
}
|
||||
|
||||
void Open(const char *path, int fd, int flags) {
|
||||
const char *err;
|
||||
close(fd);
|
||||
if (open(path, flags, 0644) == -1) {
|
||||
SysExit(7, "open", path);
|
||||
}
|
||||
}
|
||||
|
||||
wontreturn void Exec(void) {
|
||||
const char *s;
|
||||
if (!n) {
|
||||
Write(prog, ": error: too few args\n", 0);
|
||||
exit(5);
|
||||
}
|
||||
execv(args[0], args);
|
||||
SysExit(127, "execve", args[0]);
|
||||
}
|
||||
|
||||
void Pipe(void) {
|
||||
int pid, pfds[2];
|
||||
if (pipe2(pfds, O_CLOEXEC)) {
|
||||
SysExit(8, "pipe2", prog);
|
||||
}
|
||||
if ((pid = vfork()) == -1) {
|
||||
SysExit(9, "vfork", prog);
|
||||
}
|
||||
if (!pid) {
|
||||
dup2(pfds[1], 1);
|
||||
Exec();
|
||||
}
|
||||
dup2(pfds[0], 0);
|
||||
n = 0;
|
||||
}
|
||||
|
||||
char *Tokenize(void) {
|
||||
char *r;
|
||||
int c, t;
|
||||
while (*p == ' ' || *p == '\t' || *p == '\n' ||
|
||||
(p[0] == '\\' && p[1] == '\n')) {
|
||||
++p;
|
||||
}
|
||||
if (!*p) return 0;
|
||||
t = STATE_SHELL;
|
||||
for (r = q;; ++p) {
|
||||
switch (t) {
|
||||
|
||||
case STATE_SHELL:
|
||||
if (unsupported[*p & 255]) {
|
||||
UnsupportedSyntax(*p);
|
||||
}
|
||||
if (!*p || *p == ' ' || *p == '\t') {
|
||||
*q++ = 0;
|
||||
return r;
|
||||
} else if (*p == '"') {
|
||||
t = STATE_QUO;
|
||||
} else if (*p == '\'') {
|
||||
t = STATE_STR;
|
||||
} else if (*p == '\\') {
|
||||
if (!p[1]) UnsupportedSyntax(*p);
|
||||
*q++ = *++p;
|
||||
} else if (*p == '|') {
|
||||
if (q > r) {
|
||||
*q = 0;
|
||||
return r;
|
||||
} else {
|
||||
Pipe();
|
||||
++p;
|
||||
}
|
||||
} else {
|
||||
*q++ = *p;
|
||||
}
|
||||
break;
|
||||
|
||||
case STATE_STR:
|
||||
if (!*p) {
|
||||
Write("cmd: error: unterminated single string\n", 0);
|
||||
exit(6);
|
||||
}
|
||||
if (*p == '\'') {
|
||||
t = STATE_SHELL;
|
||||
} else {
|
||||
*q++ = *p;
|
||||
}
|
||||
break;
|
||||
|
||||
case STATE_QUO:
|
||||
if (!*p) {
|
||||
Write("cmd: error: unterminated quoted string\n", 0);
|
||||
exit(6);
|
||||
}
|
||||
if (*p == '"') {
|
||||
t = STATE_SHELL;
|
||||
} else if (p[0] == '\\') {
|
||||
switch ((c = *++p)) {
|
||||
case 0:
|
||||
UnsupportedSyntax('\\');
|
||||
case '\n':
|
||||
break;
|
||||
case '$':
|
||||
case '`':
|
||||
case '"':
|
||||
*q++ = c;
|
||||
break;
|
||||
default:
|
||||
*q++ = '\\';
|
||||
*q++ = c;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
*q++ = *p;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
unreachable;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int cocmd(int argc, char *argv[]) {
|
||||
char *arg;
|
||||
size_t i, j;
|
||||
prog = argc > 0 ? argv[0] : "cocmd.com";
|
||||
|
||||
for (i = 1; i < 32; ++i) {
|
||||
unsupported[i] = true;
|
||||
}
|
||||
unsupported['\t'] = false;
|
||||
unsupported[0177] = true;
|
||||
unsupported['~'] = true;
|
||||
unsupported['`'] = true;
|
||||
unsupported['#'] = true;
|
||||
unsupported['*'] = true;
|
||||
unsupported['('] = true;
|
||||
unsupported[')'] = true;
|
||||
unsupported['['] = true;
|
||||
unsupported[']'] = true;
|
||||
unsupported['{'] = true;
|
||||
unsupported['}'] = true;
|
||||
unsupported[';'] = true;
|
||||
unsupported['?'] = true;
|
||||
unsupported['!'] = true;
|
||||
|
||||
if (argc != 3) {
|
||||
Write(prog, ": error: wrong number of args\n", 0);
|
||||
exit(10);
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "-c")) {
|
||||
Write(prog, ": error: argv[1] should -c\n", 0);
|
||||
exit(11);
|
||||
}
|
||||
|
||||
p = cmd = argv[2];
|
||||
if (strlen(cmd) >= ARG_MAX) {
|
||||
Write(prog, ": error: cmd too long: ", cmd, "\n", 0);
|
||||
exit(12);
|
||||
}
|
||||
|
||||
n = 0;
|
||||
q = argbuf;
|
||||
while ((arg = Tokenize())) {
|
||||
if (n + 1 < ARRAYLEN(args)) {
|
||||
if (isdigit(arg[0]) && arg[1] == '>' && arg[2] == '&' &&
|
||||
isdigit(arg[3])) {
|
||||
dup2(arg[3] - '0', arg[0] - '0');
|
||||
} else if (arg[0] == '>' && arg[1] == '&' && isdigit(arg[2])) {
|
||||
dup2(arg[2] - '0', 1);
|
||||
} else if (isdigit(arg[0]) && arg[1] == '>' && arg[2] == '>') {
|
||||
Open(arg + 3, arg[0] - '0', O_WRONLY | O_CREAT | O_APPEND);
|
||||
} else if (arg[0] == '>' && arg[1] == '>') {
|
||||
Open(arg + 2, 1, O_WRONLY | O_CREAT | O_APPEND);
|
||||
} else if (isdigit(arg[0]) && arg[1] == '>') {
|
||||
Open(arg + 2, arg[0] - '0', O_WRONLY | O_CREAT | O_TRUNC);
|
||||
} else if (arg[0] == '>') {
|
||||
Open(arg + 1, 1, O_WRONLY | O_CREAT | O_TRUNC);
|
||||
} else if (arg[0] == '<') {
|
||||
Open(arg + 1, 0, O_RDONLY);
|
||||
} else {
|
||||
args[n++] = arg;
|
||||
args[n] = 0;
|
||||
}
|
||||
} else {
|
||||
Write(prog, ": error: too many args\n", 0);
|
||||
exit(13);
|
||||
}
|
||||
}
|
||||
|
||||
Exec();
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue